diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2023-05-06 09:09:33 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-06 09:09:33 +0900 |
| commit | bc4a1198fcebc460814e9edd6e492ef99389ccd7 (patch) | |
| tree | cd3c42516f0bd3d87f2487af326623678ba17e94 | |
| parent | ea1a0d76af42436115c26e4c7f60d56e993069a1 (diff) | |
| parent | 0a64dac604564fc7544a4cc5d232b95871c6514c (diff) | |
| download | rust-bc4a1198fcebc460814e9edd6e492ef99389ccd7.tar.gz rust-bc4a1198fcebc460814e9edd6e492ef99389ccd7.zip | |
Rollup merge of #111239 - TaKO8Ki:fix-111232, r=compiler-errors
Remove unnecessary attribute from a diagnostic Fixes #111232 ref: https://github.com/rust-lang/rust/commit/06ff310cf95349da078e4cac0c5377172766fa94
| -rw-r--r-- | compiler/rustc_hir_analysis/src/errors.rs | 1 | ||||
| -rw-r--r-- | tests/ui/specialization/issue-111232.rs | 11 | ||||
| -rw-r--r-- | tests/ui/specialization/issue-111232.stderr | 11 |
3 files changed, 22 insertions, 1 deletions
diff --git a/compiler/rustc_hir_analysis/src/errors.rs b/compiler/rustc_hir_analysis/src/errors.rs index c0ee777722e..30e2c675f59 100644 --- a/compiler/rustc_hir_analysis/src/errors.rs +++ b/compiler/rustc_hir_analysis/src/errors.rs @@ -657,7 +657,6 @@ pub enum ImplNotMarkedDefault { #[note] Err { #[primary_span] - #[label] span: Span, cname: Symbol, ident: Symbol, diff --git a/tests/ui/specialization/issue-111232.rs b/tests/ui/specialization/issue-111232.rs new file mode 100644 index 00000000000..3ed3c580e6d --- /dev/null +++ b/tests/ui/specialization/issue-111232.rs @@ -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() {} diff --git a/tests/ui/specialization/issue-111232.stderr b/tests/ui/specialization/issue-111232.stderr new file mode 100644 index 00000000000..27ee42fc00c --- /dev/null +++ b/tests/ui/specialization/issue-111232.stderr @@ -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`. |
