about summary refs log tree commit diff
path: root/compiler/rustc_metadata/src/errors.rs
diff options
context:
space:
mode:
authorEzra Shaw <ezrasure@outlook.com>2022-12-22 20:21:43 +1300
committerEzra Shaw <ezrasure@outlook.com>2022-12-31 20:44:54 +1300
commit24b39ece2f308aee31baf1548d24bbfbe7bf07fe (patch)
tree7fddee1a8fb55eb3afbf018a8f30cff1ea51e812 /compiler/rustc_metadata/src/errors.rs
parent5570cda1870a399532c34b36c89fe0b03d59c72c (diff)
downloadrust-24b39ece2f308aee31baf1548d24bbfbe7bf07fe.tar.gz
rust-24b39ece2f308aee31baf1548d24bbfbe7bf07fe.zip
refactor: merge `E0465` into `E0464`
Diffstat (limited to 'compiler/rustc_metadata/src/errors.rs')
-rw-r--r--compiler/rustc_metadata/src/errors.rs14
1 files changed, 2 insertions, 12 deletions
diff --git a/compiler/rustc_metadata/src/errors.rs b/compiler/rustc_metadata/src/errors.rs
index de2a879f1d7..1e08e95c01f 100644
--- a/compiler/rustc_metadata/src/errors.rs
+++ b/compiler/rustc_metadata/src/errors.rs
@@ -486,26 +486,16 @@ impl IntoDiagnostic<'_> for MultipleCandidates {
         let mut diag = handler.struct_err(rustc_errors::fluent::metadata_multiple_candidates);
         diag.set_arg("crate_name", self.crate_name);
         diag.set_arg("flavor", self.flavor);
-        diag.code(error_code!(E0465));
+        diag.code(error_code!(E0464));
         diag.set_span(self.span);
         for (i, candidate) in self.candidates.iter().enumerate() {
-            diag.span_note(self.span, &format!("candidate #{}: {}", i + 1, candidate.display()));
+            diag.note(&format!("candidate #{}: {}", i + 1, candidate.display()));
         }
         diag
     }
 }
 
 #[derive(Diagnostic)]
-#[diag(metadata_multiple_matching_crates, code = "E0464")]
-#[note]
-pub struct MultipleMatchingCrates {
-    #[primary_span]
-    pub span: Span,
-    pub crate_name: Symbol,
-    pub candidates: String,
-}
-
-#[derive(Diagnostic)]
 #[diag(metadata_symbol_conflicts_current, code = "E0519")]
 pub struct SymbolConflictsCurrent {
     #[primary_span]