diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2023-02-26 10:29:25 +0000 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2023-02-26 10:29:25 +0000 |
| commit | 752ddd028c877c2033940d0dcd4e3dcbf569ae9d (patch) | |
| tree | 5fc07704f10ddb5618cddd0231592870896d3a02 /compiler/rustc_passes/src/errors.rs | |
| parent | 11fbb573951d61b7de9b773750c206253a5db974 (diff) | |
| download | rust-752ddd028c877c2033940d0dcd4e3dcbf569ae9d.tar.gz rust-752ddd028c877c2033940d0dcd4e3dcbf569ae9d.zip | |
Merge the two diagnostics.
Diffstat (limited to 'compiler/rustc_passes/src/errors.rs')
| -rw-r--r-- | compiler/rustc_passes/src/errors.rs | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/compiler/rustc_passes/src/errors.rs b/compiler/rustc_passes/src/errors.rs index 2c0d21b4798..9f1c0b5a0b7 100644 --- a/compiler/rustc_passes/src/errors.rs +++ b/compiler/rustc_passes/src/errors.rs @@ -810,22 +810,16 @@ impl IntoDiagnostic<'_> for InvalidAttrAtCrateLevel { } #[derive(Diagnostic)] -#[diag(passes_duplicate_diagnostic_item)] -pub struct DuplicateDiagnosticItem { - #[primary_span] - pub span: Span, - pub name: Symbol, -} - -#[derive(Diagnostic)] #[diag(passes_duplicate_diagnostic_item_in_crate)] pub struct DuplicateDiagnosticItemInCrate { + #[primary_span] + pub duplicate_span: Option<Span>, #[note(passes_diagnostic_item_first_defined)] - pub span: Option<Span>, - pub orig_crate_name: Symbol, + pub orig_span: Option<Span>, #[note] - pub have_orig_crate_name: Option<()>, + pub different_crates: Option<()>, pub crate_name: Symbol, + pub orig_crate_name: Symbol, pub name: Symbol, } |