about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorCamille GILLOT <gillot.camille@gmail.com>2023-02-26 10:29:25 +0000
committerCamille GILLOT <gillot.camille@gmail.com>2023-02-26 10:29:25 +0000
commit752ddd028c877c2033940d0dcd4e3dcbf569ae9d (patch)
tree5fc07704f10ddb5618cddd0231592870896d3a02 /tests
parent11fbb573951d61b7de9b773750c206253a5db974 (diff)
downloadrust-752ddd028c877c2033940d0dcd4e3dcbf569ae9d.tar.gz
rust-752ddd028c877c2033940d0dcd4e3dcbf569ae9d.zip
Merge the two diagnostics.
Diffstat (limited to 'tests')
-rw-r--r--tests/ui/tool-attributes/duplicate-diagnostic.rs2
-rw-r--r--tests/ui/tool-attributes/duplicate-diagnostic.stderr4
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/ui/tool-attributes/duplicate-diagnostic.rs b/tests/ui/tool-attributes/duplicate-diagnostic.rs
index 39c2ca1cb86..e2cf9508757 100644
--- a/tests/ui/tool-attributes/duplicate-diagnostic.rs
+++ b/tests/ui/tool-attributes/duplicate-diagnostic.rs
@@ -9,5 +9,5 @@ extern crate p1;
 extern crate p2;
 
 #[rustc_diagnostic_item = "Foo"]
-pub struct Foo {} //~ ERROR duplicate diagnostic item found
+pub struct Foo {} //~ ERROR duplicate diagnostic item in crate `duplicate_diagnostic`: `Foo`
 fn main() {}
diff --git a/tests/ui/tool-attributes/duplicate-diagnostic.stderr b/tests/ui/tool-attributes/duplicate-diagnostic.stderr
index e315fdc7d84..26bd6a82e34 100644
--- a/tests/ui/tool-attributes/duplicate-diagnostic.stderr
+++ b/tests/ui/tool-attributes/duplicate-diagnostic.stderr
@@ -2,11 +2,13 @@ error: duplicate diagnostic item in crate `p2`: `Foo`.
    |
    = note: the diagnostic item is first defined in crate `p1`.
 
-error: duplicate diagnostic item found: `Foo`.
+error: duplicate diagnostic item in crate `duplicate_diagnostic`: `Foo`.
   --> $DIR/duplicate-diagnostic.rs:12:1
    |
 LL | pub struct Foo {}
    | ^^^^^^^^^^^^^^
+   |
+   = note: the diagnostic item is first defined in crate `p2`.
 
 error: aborting due to 2 previous errors