Skip to content

Fix ICE in 'duplicate diagnostic item' diagnostic #108377

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 1 commit into from
Feb 24, 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
2 changes: 1 addition & 1 deletion compiler/rustc_passes/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,10 @@ passes_duplicate_diagnostic_item =

passes_duplicate_diagnostic_item_in_crate =
duplicate diagnostic item in crate `{$crate_name}`: `{$name}`.
.note = the diagnostic item is first defined in crate `{$orig_crate_name}`.

passes_diagnostic_item_first_defined =
the diagnostic item is first defined here
.note = the diagnostic item is first defined in crate `{$orig_crate_name}`.

passes_abi =
abi: {$abi}
Expand Down
3 changes: 3 additions & 0 deletions tests/ui/tool-attributes/auxiliary/p1.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#![feature(rustc_attrs)]
#[rustc_diagnostic_item = "Foo"]
pub struct Foo {}
3 changes: 3 additions & 0 deletions tests/ui/tool-attributes/auxiliary/p2.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#![feature(rustc_attrs)]
#[rustc_diagnostic_item = "Foo"]
pub struct Foo {}
13 changes: 13 additions & 0 deletions tests/ui/tool-attributes/duplicate-diagnostic.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// aux-build: p1.rs
// aux-build: p2.rs

// error-pattern: duplicate diagnostic item in crate `p2`
// error-pattern: note: the diagnostic item is first defined in crate `p1`

#![feature(rustc_attrs)]
extern crate p1;
extern crate p2;

#[rustc_diagnostic_item = "Foo"]
pub struct Foo {} //~ ERROR duplicate diagnostic item found
fn main() {}
12 changes: 12 additions & 0 deletions tests/ui/tool-attributes/duplicate-diagnostic.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
error: duplicate diagnostic item in crate `p2`: `Foo`.
|
= note: the diagnostic item is first defined in crate `p1`.

error: duplicate diagnostic item found: `Foo`.
--> $DIR/duplicate-diagnostic.rs:12:1
|
LL | pub struct Foo {}
| ^^^^^^^^^^^^^^

error: aborting due to 2 previous errors