Skip to content

Commit a733082

Browse files
committed
Avoid need for {D,Subd}iagnosticMessage imports.
The `fluent_messages!` macro produces uses of `crate::{D,Subd}iagnosticMessage`, which means that every crate using the macro must have this import: ``` use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage}; ``` This commit changes the macro to instead use `rustc_errors::{D,Subd}iagnosticMessage`, which avoids the need for the imports.
1 parent df9f839 commit a733082

File tree

33 files changed

+22
-58
lines changed

33 files changed

+22
-58
lines changed

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ use rustc_data_structures::fx::FxHashMap;
5555
use rustc_data_structures::sorted_map::SortedMap;
5656
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
5757
use rustc_data_structures::sync::Lrc;
58-
use rustc_errors::{
59-
DiagnosticArgFromDisplay, DiagnosticMessage, Handler, StashKey, SubdiagnosticMessage,
60-
};
58+
use rustc_errors::{DiagnosticArgFromDisplay, Handler, StashKey};
6159
use rustc_fluent_macro::fluent_messages;
6260
use rustc_hir as hir;
6361
use rustc_hir::def::{DefKind, LifetimeRes, Namespace, PartialRes, PerNS, Res};

compiler/rustc_ast_passes/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![deny(rustc::untranslatable_diagnostic)]
1616
#![deny(rustc::diagnostic_outside_of_impl)]
1717

18-
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
1918
use rustc_fluent_macro::fluent_messages;
2019

2120
pub mod ast_validation;

compiler/rustc_attr/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#[macro_use]
1515
extern crate rustc_macros;
1616

17-
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
1817
use rustc_fluent_macro::fluent_messages;
1918

2019
mod builtin;

compiler/rustc_borrowck/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extern crate tracing;
2222

2323
use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
2424
use rustc_data_structures::graph::dominators::Dominators;
25-
use rustc_errors::{Diagnostic, DiagnosticBuilder, DiagnosticMessage, SubdiagnosticMessage};
25+
use rustc_errors::{Diagnostic, DiagnosticBuilder};
2626
use rustc_fluent_macro::fluent_messages;
2727
use rustc_hir as hir;
2828
use rustc_hir::def_id::LocalDefId;

compiler/rustc_builtin_macros/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ extern crate tracing;
2323

2424
use crate::deriving::*;
2525

26-
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
2726
use rustc_expand::base::{MacroExpanderFn, ResolverExpand, SyntaxExtensionKind};
2827
use rustc_expand::proc_macro::BangProcMacro;
2928
use rustc_fluent_macro::fluent_messages;

compiler/rustc_codegen_gcc/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ use rustc_codegen_ssa::target_features::supported_target_features;
101101
use rustc_data_structures::fx::FxIndexMap;
102102
use rustc_data_structures::sync::IntoDynSyncSend;
103103
use rustc_codegen_ssa::traits::{CodegenBackend, ExtraBackendMethods, ThinBufferMethods, WriteBackendMethods};
104-
use rustc_errors::{DiagnosticMessage, ErrorGuaranteed, Handler, SubdiagnosticMessage};
104+
use rustc_errors::{ErrorGuaranteed, Handler};
105105
use rustc_fluent_macro::fluent_messages;
106106
use rustc_metadata::EncodedMetadata;
107107
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};

compiler/rustc_codegen_llvm/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use rustc_codegen_ssa::traits::*;
4040
use rustc_codegen_ssa::ModuleCodegen;
4141
use rustc_codegen_ssa::{CodegenResults, CompiledModule};
4242
use rustc_data_structures::fx::FxIndexMap;
43-
use rustc_errors::{DiagnosticMessage, ErrorGuaranteed, FatalError, Handler, SubdiagnosticMessage};
43+
use rustc_errors::{ErrorGuaranteed, FatalError, Handler};
4444
use rustc_fluent_macro::fluent_messages;
4545
use rustc_metadata::EncodedMetadata;
4646
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};

compiler/rustc_codegen_ssa/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ extern crate rustc_middle;
2727
use rustc_ast as ast;
2828
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
2929
use rustc_data_structures::sync::Lrc;
30-
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
3130
use rustc_fluent_macro::fluent_messages;
3231
use rustc_hir::def_id::CrateNum;
3332
use rustc_middle::dep_graph::WorkProduct;

compiler/rustc_const_eval/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ pub mod util;
3939

4040
pub use errors::ReportErrorExt;
4141

42-
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
4342
use rustc_fluent_macro::fluent_messages;
4443
use rustc_middle::{ty, util::Providers};
4544

compiler/rustc_driver_impl/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use rustc_data_structures::profiling::{
2828
use rustc_data_structures::sync::SeqCst;
2929
use rustc_errors::registry::{InvalidErrorCode, Registry};
3030
use rustc_errors::{markdown, ColorConfig};
31-
use rustc_errors::{DiagnosticMessage, ErrorGuaranteed, Handler, PResult, SubdiagnosticMessage};
31+
use rustc_errors::{ErrorGuaranteed, Handler, PResult};
3232
use rustc_feature::find_gated_cfg;
3333
use rustc_fluent_macro::fluent_messages;
3434
use rustc_interface::util::{self, collect_crate_types, get_codegen_backend};

0 commit comments

Comments
 (0)