mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 14:55:26 +00:00
Rollup merge of #105106 - jhpratt:issue-105101, r=TaKO8Ki
Fix ICE from #105101 Fixes #105101 Rather than comparing idents, compare spans, which should be unique to each variant.
This commit is contained in:
commit
ee9eaa695c
@ -145,7 +145,7 @@ fn extract_default_variant<'a>(
|
||||
let suggestion = default_variants
|
||||
.iter()
|
||||
.filter_map(|v| {
|
||||
if v.ident == variant.ident {
|
||||
if v.span == variant.span {
|
||||
None
|
||||
} else {
|
||||
Some((cx.sess.find_by_name(&v.attrs, kw::Default)?.span, String::new()))
|
||||
|
9
src/test/ui/deriving/issue-105101.rs
Normal file
9
src/test/ui/deriving/issue-105101.rs
Normal file
@ -0,0 +1,9 @@
|
||||
// compile-flags: --crate-type=lib
|
||||
|
||||
#[derive(Default)] //~ ERROR multiple declared defaults
|
||||
enum E {
|
||||
#[default]
|
||||
A,
|
||||
#[default]
|
||||
A, //~ ERROR defined multiple times
|
||||
}
|
29
src/test/ui/deriving/issue-105101.stderr
Normal file
29
src/test/ui/deriving/issue-105101.stderr
Normal file
@ -0,0 +1,29 @@
|
||||
error: multiple declared defaults
|
||||
--> $DIR/issue-105101.rs:3:10
|
||||
|
|
||||
LL | #[derive(Default)]
|
||||
| ^^^^^^^
|
||||
...
|
||||
LL | A,
|
||||
| - first default
|
||||
LL | #[default]
|
||||
LL | A,
|
||||
| - additional default
|
||||
|
|
||||
= note: only one variant can be default
|
||||
= note: this error originates in the derive macro `Default` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error[E0428]: the name `A` is defined multiple times
|
||||
--> $DIR/issue-105101.rs:8:5
|
||||
|
|
||||
LL | A,
|
||||
| - previous definition of the type `A` here
|
||||
LL | #[default]
|
||||
LL | A,
|
||||
| ^ `A` redefined here
|
||||
|
|
||||
= note: `A` must be defined only once in the type namespace of this enum
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
For more information about this error, try `rustc --explain E0428`.
|
Loading…
Reference in New Issue
Block a user