Skip to content

Rollup of 3 pull requests #115074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions compiler/rustc_error_codes/src/error_codes/E0191.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ trait Trait {
type Bar;
}

type Foo = Trait; // error: the value of the associated type `Bar` (from
// the trait `Trait`) must be specified
type Foo = dyn Trait; // error: the value of the associated type `Bar` (from
// the trait `Trait`) must be specified
```

Trait objects need to have all associated types specified. Please verify that
Expand All @@ -20,5 +20,5 @@ trait Trait {
type Bar;
}

type Foo = Trait<Bar=i32>; // ok!
type Foo = dyn Trait<Bar=i32>; // ok!
```
2 changes: 1 addition & 1 deletion compiler/rustc_smir/src/stable_mir/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Module that implements the public interface to the Stable MIR.
//!
//! This module shall contain all type definitions and APIs that we expect 3P tools to invoke to
//! This module shall contain all type definitions and APIs that we expect third-party tools to invoke to
//! interact with the compiler.
//!
//! The goal is to eventually move this module to its own crate which shall be published on
Expand Down
1 change: 1 addition & 0 deletions library/std/src/f32.rs
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,7 @@ impl f32 {
///
/// assert!(abs_difference < 1e-10);
/// ```
#[doc(alias = "log1p")]
#[rustc_allow_incoherent_impl]
#[must_use = "method returns a new number and does not mutate the original value"]
#[stable(feature = "rust1", since = "1.0.0")]
Expand Down
1 change: 1 addition & 0 deletions library/std/src/f64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,7 @@ impl f64 {
///
/// assert!(abs_difference < 1e-20);
/// ```
#[doc(alias = "log1p")]
#[rustc_allow_incoherent_impl]
#[must_use = "method returns a new number and does not mutate the original value"]
#[stable(feature = "rust1", since = "1.0.0")]
Expand Down