Skip to content

Commit 3b2f33e

Browse files
Rollup merge of #118158 - nnethercote:reduce-fluent-boilerplate, r=compiler-errors
Reduce fluent boilerplate Best reviewed one commit at a time. r? `@davidtwco`
2 parents fcb9fcc + af3fbb3 commit 3b2f33e

File tree

51 files changed

+301
-414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+301
-414
lines changed

Cargo.lock

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3716,7 +3716,6 @@ dependencies = [
37163716
"rustc_const_eval",
37173717
"rustc_data_structures",
37183718
"rustc_error_codes",
3719-
"rustc_error_messages",
37203719
"rustc_errors",
37213720
"rustc_expand",
37223721
"rustc_feature",
@@ -3771,7 +3770,6 @@ dependencies = [
37713770
"intl-memoizer",
37723771
"rustc_baked_icu_data",
37733772
"rustc_data_structures",
3774-
"rustc_fluent_macro",
37753773
"rustc_macros",
37763774
"rustc_serialize",
37773775
"rustc_span",
@@ -3869,7 +3867,6 @@ dependencies = [
38693867
"rustc_arena",
38703868
"rustc_ast",
38713869
"rustc_data_structures",
3872-
"rustc_error_messages",
38733870
"rustc_index",
38743871
"rustc_macros",
38753872
"rustc_serialize",

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +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-
};
61-
use rustc_fluent_macro::fluent_messages;
58+
use rustc_errors::{DiagnosticArgFromDisplay, Handler, StashKey};
6259
use rustc_hir as hir;
6360
use rustc_hir::def::{DefKind, LifetimeRes, Namespace, PartialRes, PerNS, Res};
6461
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID, LOCAL_CRATE};
@@ -94,7 +91,7 @@ mod lifetime_collector;
9491
mod pat;
9592
mod path;
9693

97-
fluent_messages! { "../messages.ftl" }
94+
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
9895

9996
struct LoweringContext<'a, 'hir> {
10097
tcx: TyCtxt<'hir>,

compiler/rustc_ast_passes/src/lib.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
#![deny(rustc::untranslatable_diagnostic)]
1616
#![deny(rustc::diagnostic_outside_of_impl)]
1717

18-
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
19-
use rustc_fluent_macro::fluent_messages;
20-
2118
pub mod ast_validation;
2219
mod errors;
2320
pub mod feature_gate;
2421
pub mod node_count;
2522
pub mod show_span;
2623

27-
fluent_messages! { "../messages.ftl" }
24+
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }

compiler/rustc_attr/src/lib.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
#[macro_use]
1515
extern crate rustc_macros;
1616

17-
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
18-
use rustc_fluent_macro::fluent_messages;
19-
2017
mod builtin;
2118
mod session_diagnostics;
2219

@@ -29,4 +26,4 @@ pub use rustc_ast::attr::*;
2926

3027
pub(crate) use rustc_session::HashStableContext;
3128

32-
fluent_messages! { "../messages.ftl" }
29+
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }

compiler/rustc_borrowck/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +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};
26-
use rustc_fluent_macro::fluent_messages;
25+
use rustc_errors::{Diagnostic, DiagnosticBuilder};
2726
use rustc_hir as hir;
2827
use rustc_hir::def_id::LocalDefId;
2928
use rustc_index::bit_set::{BitSet, ChunkedBitSet};
@@ -98,7 +97,7 @@ use places_conflict::{places_conflict, PlaceConflictBias};
9897
use region_infer::RegionInferenceContext;
9998
use renumber::RegionCtxt;
10099

101-
fluent_messages! { "../messages.ftl" }
100+
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
102101

103102
// FIXME(eddyb) perhaps move this somewhere more centrally.
104103
#[derive(Debug)]

compiler/rustc_builtin_macros/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ 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;
29-
use rustc_fluent_macro::fluent_messages;
3028
use rustc_span::symbol::sym;
3129

3230
mod alloc_error_handler;
@@ -59,7 +57,7 @@ pub mod proc_macro_harness;
5957
pub mod standard_library_imports;
6058
pub mod test_harness;
6159

62-
fluent_messages! { "../messages.ftl" }
60+
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
6361

6462
pub fn register_builtin_macros(resolver: &mut dyn ResolverExpand) {
6563
let mut register = |name, kind| resolver.register_builtin_macro(name, kind);

compiler/rustc_codegen_gcc/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +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};
105-
use rustc_fluent_macro::fluent_messages;
104+
use rustc_errors::{ErrorGuaranteed, Handler};
106105
use rustc_metadata::EncodedMetadata;
107106
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
108107
use rustc_middle::util::Providers;
@@ -116,7 +115,7 @@ use tempfile::TempDir;
116115
use crate::back::lto::ModuleBuffer;
117116
use crate::gcc_util::target_cpu;
118117

119-
fluent_messages! { "../messages.ftl" }
118+
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
120119

121120
pub struct PrintOnPanic<F: Fn() -> String>(pub F);
122121

compiler/rustc_codegen_llvm/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +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};
44-
use rustc_fluent_macro::fluent_messages;
43+
use rustc_errors::{ErrorGuaranteed, FatalError, Handler};
4544
use rustc_metadata::EncodedMetadata;
4645
use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
4746
use rustc_middle::ty::TyCtxt;
@@ -92,7 +91,7 @@ mod type_of;
9291
mod va_arg;
9392
mod value;
9493

95-
fluent_messages! { "../messages.ftl" }
94+
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
9695

9796
#[derive(Clone)]
9897
pub struct LlvmCodegenBackend(());

compiler/rustc_codegen_ssa/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +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};
31-
use rustc_fluent_macro::fluent_messages;
3230
use rustc_hir::def_id::CrateNum;
3331
use rustc_middle::dep_graph::WorkProduct;
3432
use rustc_middle::middle::debugger_visualizer::DebuggerVisualizerFile;
@@ -60,7 +58,7 @@ pub mod mono_item;
6058
pub mod target_features;
6159
pub mod traits;
6260

63-
fluent_messages! { "../messages.ftl" }
61+
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
6462

6563
pub struct ModuleCodegen<M> {
6664
/// The name of the module. When the crate may be saved between

compiler/rustc_const_eval/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ pub mod util;
3939

4040
pub use errors::ReportErrorExt;
4141

42-
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
43-
use rustc_fluent_macro::fluent_messages;
4442
use rustc_middle::{ty, util::Providers};
4543

46-
fluent_messages! { "../messages.ftl" }
44+
rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
4745

4846
pub fn provide(providers: &mut Providers) {
4947
const_eval::provide(providers);

0 commit comments

Comments
 (0)