diff options
| author | bors <bors@rust-lang.org> | 2022-12-31 20:10:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-31 20:10:02 +0000 |
| commit | 574b64a97f52162f965bc201e47f0af8279ca65d (patch) | |
| tree | d463d1644ad28e2de82aae6c0e8c0ba0bcbd2fcb /compiler/rustc_metadata/src/errors.rs | |
| parent | dd01a163c1cff9461ddd85e7b3c2c0109657658f (diff) | |
| parent | 24b39ece2f308aee31baf1548d24bbfbe7bf07fe (diff) | |
| download | rust-574b64a97f52162f965bc201e47f0af8279ca65d.tar.gz rust-574b64a97f52162f965bc201e47f0af8279ca65d.zip | |
Auto merge of #106282 - Ezrashaw:merge-e0465, r=estebank
refactor: merge error code `E0465` into `E0464` `E0465` is an undocumented and untested error code that is functionally identical to `E0464`. This PR merges `E0465` into `E0464`, thus documenting and testing another error code (#61137). r? `@GuillaumeGomez` (not sure if you want to review this but it's relevant to my other PRs that you have reviewed)
Diffstat (limited to 'compiler/rustc_metadata/src/errors.rs')
| -rw-r--r-- | compiler/rustc_metadata/src/errors.rs | 14 |
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] |