Skip to content

Commit

Permalink
Rollup merge of #111239 - TaKO8Ki:fix-111232, r=compiler-errors
Browse files Browse the repository at this point in the history
Remove unnecessary attribute from a diagnostic

Fixes #111232

ref: 06ff310
  • Loading branch information
JohnTitor authored May 6, 2023
2 parents ea1a0d7 + 0a64dac commit bc4a119
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
1 change: 0 additions & 1 deletion compiler/rustc_hir_analysis/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,6 @@ pub enum ImplNotMarkedDefault {
#[note]
Err {
#[primary_span]
#[label]
span: Span,
cname: Symbol,
ident: Symbol,
Expand Down
11 changes: 11 additions & 0 deletions tests/ui/specialization/issue-111232.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#![feature(min_specialization)]

struct S;

impl From<S> for S {
fn from(s: S) -> S { //~ ERROR `from` specializes an item from a parent `impl`, but that item is not marked `default`
s
}
}

fn main() {}
11 changes: 11 additions & 0 deletions tests/ui/specialization/issue-111232.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
error[E0520]: `from` specializes an item from a parent `impl`, but that item is not marked `default`
--> $DIR/issue-111232.rs:6:5
|
LL | fn from(s: S) -> S {
| ^^^^^^^^^^^^^^^^^^
|
= note: parent implementation is in crate `core`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0520`.

0 comments on commit bc4a119

Please sign in to comment.