Skip to content

Commit b5d3d97

Browse files
NoratriebNoratrieb
committed
Add rustc_fluent_macro to decouple fluent from rustc_macros
Fluent, with all the icu4x it brings in, takes quite some time to compile. `fluent_messages!` is only needed in further downstream rustc crates, but is blocking more upstream crates like `rustc_index`. By splitting it out, we allow `rustc_macros` to be compiled earlier, which speeds up `x check compiler` by about 5 seconds (and even more after the needless dependency on `serde_json` is removed from `rustc_data_structures`).
1 parent de96f3d commit b5d3d97

File tree

81 files changed

+398
-293
lines changed

Some content is hidden

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

81 files changed

+398
-293
lines changed

‎Cargo.lock

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2941,6 +2941,7 @@ dependencies = [
29412941
"rustc_ast_pretty",
29422942
"rustc_data_structures",
29432943
"rustc_errors",
2944+
"rustc_fluent_macro",
29442945
"rustc_hir",
29452946
"rustc_index",
29462947
"rustc_macros",
@@ -2964,6 +2965,7 @@ dependencies = [
29642965
"rustc_data_structures",
29652966
"rustc_errors",
29662967
"rustc_feature",
2968+
"rustc_fluent_macro",
29672969
"rustc_macros",
29682970
"rustc_parse",
29692971
"rustc_session",
@@ -2991,6 +2993,7 @@ dependencies = [
29912993
"rustc_data_structures",
29922994
"rustc_errors",
29932995
"rustc_feature",
2996+
"rustc_fluent_macro",
29942997
"rustc_lexer",
29952998
"rustc_macros",
29962999
"rustc_serialize",
@@ -3018,6 +3021,7 @@ dependencies = [
30183021
"polonius-engine",
30193022
"rustc_data_structures",
30203023
"rustc_errors",
3024+
"rustc_fluent_macro",
30213025
"rustc_graphviz",
30223026
"rustc_hir",
30233027
"rustc_index",
@@ -3047,6 +3051,7 @@ dependencies = [
30473051
"rustc_errors",
30483052
"rustc_expand",
30493053
"rustc_feature",
3054+
"rustc_fluent_macro",
30503055
"rustc_lexer",
30513056
"rustc_lint_defs",
30523057
"rustc_macros",
@@ -3075,6 +3080,7 @@ dependencies = [
30753080
"rustc_codegen_ssa",
30763081
"rustc_data_structures",
30773082
"rustc_errors",
3083+
"rustc_fluent_macro",
30783084
"rustc_fs_util",
30793085
"rustc_hir",
30803086
"rustc_index",
@@ -3112,6 +3118,7 @@ dependencies = [
31123118
"rustc_attr",
31133119
"rustc_data_structures",
31143120
"rustc_errors",
3121+
"rustc_fluent_macro",
31153122
"rustc_fs_util",
31163123
"rustc_hir",
31173124
"rustc_incremental",
@@ -3144,6 +3151,7 @@ dependencies = [
31443151
"rustc_attr",
31453152
"rustc_data_structures",
31463153
"rustc_errors",
3154+
"rustc_fluent_macro",
31473155
"rustc_hir",
31483156
"rustc_index",
31493157
"rustc_infer",
@@ -3217,6 +3225,7 @@ dependencies = [
32173225
"rustc_errors",
32183226
"rustc_expand",
32193227
"rustc_feature",
3228+
"rustc_fluent_macro",
32203229
"rustc_hir",
32213230
"rustc_hir_analysis",
32223231
"rustc_hir_pretty",
@@ -3265,6 +3274,7 @@ dependencies = [
32653274
"intl-memoizer",
32663275
"rustc_baked_icu_data",
32673276
"rustc_data_structures",
3277+
"rustc_fluent_macro",
32683278
"rustc_macros",
32693279
"rustc_serialize",
32703280
"rustc_span",
@@ -3281,6 +3291,7 @@ dependencies = [
32813291
"rustc_ast_pretty",
32823292
"rustc_data_structures",
32833293
"rustc_error_messages",
3294+
"rustc_fluent_macro",
32843295
"rustc_hir",
32853296
"rustc_lint_defs",
32863297
"rustc_macros",
@@ -3309,6 +3320,7 @@ dependencies = [
33093320
"rustc_data_structures",
33103321
"rustc_errors",
33113322
"rustc_feature",
3323+
"rustc_fluent_macro",
33123324
"rustc_lexer",
33133325
"rustc_lint_defs",
33143326
"rustc_macros",
@@ -3329,6 +3341,20 @@ dependencies = [
33293341
"rustc_span",
33303342
]
33313343

3344+
[[package]]
3345+
name = "rustc_fluent_macro"
3346+
version = "0.1.0"
3347+
dependencies = [
3348+
"annotate-snippets",
3349+
"fluent-bundle",
3350+
"fluent-syntax",
3351+
"proc-macro2",
3352+
"quote",
3353+
"syn 2.0.8",
3354+
"synstructure 0.13.0",
3355+
"unic-langid",
3356+
]
3357+
33323358
[[package]]
33333359
name = "rustc_fs_util"
33343360
version = "0.0.0"
@@ -3365,6 +3391,7 @@ dependencies = [
33653391
"rustc_data_structures",
33663392
"rustc_errors",
33673393
"rustc_feature",
3394+
"rustc_fluent_macro",
33683395
"rustc_hir",
33693396
"rustc_index",
33703397
"rustc_infer",
@@ -3399,6 +3426,7 @@ dependencies = [
33993426
"rustc_ast",
34003427
"rustc_data_structures",
34013428
"rustc_errors",
3429+
"rustc_fluent_macro",
34023430
"rustc_graphviz",
34033431
"rustc_hir",
34043432
"rustc_hir_analysis",
@@ -3426,6 +3454,7 @@ dependencies = [
34263454
"rustc_ast",
34273455
"rustc_data_structures",
34283456
"rustc_errors",
3457+
"rustc_fluent_macro",
34293458
"rustc_fs_util",
34303459
"rustc_graphviz",
34313460
"rustc_hir",
@@ -3454,6 +3483,7 @@ version = "0.0.0"
34543483
dependencies = [
34553484
"rustc_data_structures",
34563485
"rustc_errors",
3486+
"rustc_fluent_macro",
34573487
"rustc_hir",
34583488
"rustc_index",
34593489
"rustc_macros",
@@ -3484,6 +3514,7 @@ dependencies = [
34843514
"rustc_data_structures",
34853515
"rustc_errors",
34863516
"rustc_expand",
3517+
"rustc_fluent_macro",
34873518
"rustc_fs_util",
34883519
"rustc_hir",
34893520
"rustc_hir_analysis",
@@ -3533,6 +3564,7 @@ dependencies = [
35333564
"rustc_data_structures",
35343565
"rustc_errors",
35353566
"rustc_feature",
3567+
"rustc_fluent_macro",
35363568
"rustc_hir",
35373569
"rustc_index",
35383570
"rustc_infer",
@@ -3586,14 +3618,10 @@ dependencies = [
35863618
name = "rustc_macros"
35873619
version = "0.1.0"
35883620
dependencies = [
3589-
"annotate-snippets",
3590-
"fluent-bundle",
3591-
"fluent-syntax",
35923621
"proc-macro2",
35933622
"quote",
35943623
"syn 2.0.8",
35953624
"synstructure 0.13.0",
3596-
"unic-langid",
35973625
]
35983626

35993627
[[package]]
@@ -3609,6 +3637,7 @@ dependencies = [
36093637
"rustc_errors",
36103638
"rustc_expand",
36113639
"rustc_feature",
3640+
"rustc_fluent_macro",
36123641
"rustc_fs_util",
36133642
"rustc_hir",
36143643
"rustc_hir_pretty",
@@ -3646,6 +3675,7 @@ dependencies = [
36463675
"rustc_error_messages",
36473676
"rustc_errors",
36483677
"rustc_feature",
3678+
"rustc_fluent_macro",
36493679
"rustc_graphviz",
36503680
"rustc_hir",
36513681
"rustc_index",
@@ -3671,6 +3701,7 @@ dependencies = [
36713701
"rustc_ast",
36723702
"rustc_data_structures",
36733703
"rustc_errors",
3704+
"rustc_fluent_macro",
36743705
"rustc_hir",
36753706
"rustc_index",
36763707
"rustc_infer",
@@ -3694,6 +3725,7 @@ dependencies = [
36943725
"rustc_ast",
36953726
"rustc_data_structures",
36963727
"rustc_errors",
3728+
"rustc_fluent_macro",
36973729
"rustc_graphviz",
36983730
"rustc_hir",
36993731
"rustc_index",
@@ -3737,6 +3769,7 @@ version = "0.0.0"
37373769
dependencies = [
37383770
"rustc_data_structures",
37393771
"rustc_errors",
3772+
"rustc_fluent_macro",
37403773
"rustc_hir",
37413774
"rustc_index",
37423775
"rustc_macros",
@@ -3760,6 +3793,7 @@ dependencies = [
37603793
"rustc_data_structures",
37613794
"rustc_errors",
37623795
"rustc_feature",
3796+
"rustc_fluent_macro",
37633797
"rustc_lexer",
37643798
"rustc_macros",
37653799
"rustc_session",
@@ -3790,6 +3824,7 @@ dependencies = [
37903824
"rustc_errors",
37913825
"rustc_expand",
37923826
"rustc_feature",
3827+
"rustc_fluent_macro",
37933828
"rustc_hir",
37943829
"rustc_index",
37953830
"rustc_lexer",
@@ -3810,6 +3845,7 @@ dependencies = [
38103845
"libloading",
38113846
"rustc_ast",
38123847
"rustc_errors",
3848+
"rustc_fluent_macro",
38133849
"rustc_lint",
38143850
"rustc_macros",
38153851
"rustc_metadata",
@@ -3825,6 +3861,7 @@ dependencies = [
38253861
"rustc_attr",
38263862
"rustc_data_structures",
38273863
"rustc_errors",
3864+
"rustc_fluent_macro",
38283865
"rustc_hir",
38293866
"rustc_hir_analysis",
38303867
"rustc_macros",
@@ -3866,6 +3903,7 @@ dependencies = [
38663903
"rustc_data_structures",
38673904
"rustc_errors",
38683905
"rustc_feature",
3906+
"rustc_fluent_macro",
38693907
"rustc_hir",
38703908
"rustc_index",
38713909
"rustc_macros",
@@ -3893,6 +3931,7 @@ dependencies = [
38933931
"rustc_errors",
38943932
"rustc_expand",
38953933
"rustc_feature",
3934+
"rustc_fluent_macro",
38963935
"rustc_hir",
38973936
"rustc_index",
38983937
"rustc_macros",
@@ -3926,6 +3965,7 @@ dependencies = [
39263965
"rustc_data_structures",
39273966
"rustc_errors",
39283967
"rustc_feature",
3968+
"rustc_fluent_macro",
39293969
"rustc_fs_util",
39303970
"rustc_hir",
39313971
"rustc_index",
@@ -3977,6 +4017,7 @@ dependencies = [
39774017
"rustc-demangle",
39784018
"rustc_data_structures",
39794019
"rustc_errors",
4020+
"rustc_fluent_macro",
39804021
"rustc_hir",
39814022
"rustc_macros",
39824023
"rustc_middle",
@@ -4019,6 +4060,7 @@ dependencies = [
40194060
"rustc_attr",
40204061
"rustc_data_structures",
40214062
"rustc_errors",
4063+
"rustc_fluent_macro",
40224064
"rustc_hir",
40234065
"rustc_index",
40244066
"rustc_infer",
@@ -4076,6 +4118,7 @@ version = "0.0.0"
40764118
dependencies = [
40774119
"rustc_data_structures",
40784120
"rustc_errors",
4121+
"rustc_fluent_macro",
40794122
"rustc_hir",
40804123
"rustc_index",
40814124
"rustc_infer",

‎compiler/rustc_ast_lowering/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1212
rustc_data_structures = { path = "../rustc_data_structures" }
1313
rustc_errors = { path = "../rustc_errors" }
1414
rustc_hir = { path = "../rustc_hir" }
15+
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1516
rustc_index = { path = "../rustc_index" }
1617
rustc_middle = { path = "../rustc_middle" }
1718
rustc_macros = { path = "../rustc_macros" }

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ use rustc_data_structures::sync::Lrc;
5555
use rustc_errors::{
5656
DiagnosticArgFromDisplay, DiagnosticMessage, Handler, StashKey, SubdiagnosticMessage,
5757
};
58+
use rustc_fluent_macro::fluent_messages;
5859
use rustc_hir as hir;
5960
use rustc_hir::def::{DefKind, LifetimeRes, Namespace, PartialRes, PerNS, Res};
6061
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID};
6162
use rustc_hir::definitions::DefPathData;
6263
use rustc_hir::{ConstArg, GenericArg, ItemLocalId, ParamName, TraitCandidate};
6364
use rustc_index::vec::{Idx, IndexSlice, IndexVec};
64-
use rustc_macros::fluent_messages;
6565
use rustc_middle::{
6666
span_bug,
6767
ty::{ResolverAstLowering, TyCtxt},

‎compiler/rustc_ast_passes/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ rustc_data_structures = { path = "../rustc_data_structures" }
1212
rustc_errors = { path = "../rustc_errors" }
1313
rustc_feature = { path = "../rustc_feature" }
1414
rustc_macros = { path = "../rustc_macros" }
15+
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1516
rustc_parse = { path = "../rustc_parse" }
1617
rustc_session = { path = "../rustc_session" }
1718
rustc_span = { path = "../rustc_span" }

‎compiler/rustc_ast_passes/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#![deny(rustc::diagnostic_outside_of_impl)]
1414

1515
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
16-
use rustc_macros::fluent_messages;
16+
use rustc_fluent_macro::fluent_messages;
1717

1818
pub mod ast_validation;
1919
mod errors;

‎compiler/rustc_attr/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ edition = "2021"
99
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1010
rustc_serialize = { path = "../rustc_serialize" }
1111
rustc_errors = { path = "../rustc_errors" }
12+
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1213
rustc_span = { path = "../rustc_span" }
1314
rustc_data_structures = { path = "../rustc_data_structures" }
1415
rustc_feature = { path = "../rustc_feature" }

‎compiler/rustc_attr/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
extern crate rustc_macros;
1313

1414
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
15-
use rustc_macros::fluent_messages;
15+
use rustc_fluent_macro::fluent_messages;
1616

1717
mod builtin;
1818
mod session_diagnostics;

‎compiler/rustc_borrowck/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ rustc_data_structures = { path = "../rustc_data_structures" }
1515
rustc_errors = { path = "../rustc_errors" }
1616
rustc_graphviz = { path = "../rustc_graphviz" }
1717
rustc_hir = { path = "../rustc_hir" }
18+
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1819
rustc_index = { path = "../rustc_index" }
1920
rustc_infer = { path = "../rustc_infer" }
2021
rustc_lexer = { path = "../rustc_lexer" }

‎compiler/rustc_borrowck/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ extern crate tracing;
2020
use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
2121
use rustc_data_structures::graph::dominators::Dominators;
2222
use rustc_errors::{Diagnostic, DiagnosticBuilder, DiagnosticMessage, SubdiagnosticMessage};
23+
use rustc_fluent_macro::fluent_messages;
2324
use rustc_hir as hir;
2425
use rustc_hir::def_id::LocalDefId;
2526
use rustc_index::bit_set::ChunkedBitSet;
2627
use rustc_index::vec::{IndexSlice, IndexVec};
2728
use rustc_infer::infer::{
2829
DefiningAnchor, InferCtxt, NllRegionVariableOrigin, RegionVariableOrigin, TyCtxtInferExt,
2930
};
30-
use rustc_macros::fluent_messages;
3131
use rustc_middle::mir::{
3232
traversal, Body, ClearCrossCrate, Local, Location, Mutability, NonDivergingIntrinsic, Operand,
3333
Place, PlaceElem, PlaceRef, VarDebugInfoContents,

‎compiler/rustc_builtin_macros/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ rustc_feature = { path = "../rustc_feature" }
1717
rustc_lexer = { path = "../rustc_lexer" }
1818
rustc_lint_defs = { path = "../rustc_lint_defs" }
1919
rustc_macros = { path = "../rustc_macros" }
20+
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
2021
rustc_parse_format = { path = "../rustc_parse_format" }
2122
rustc_parse = { path = "../rustc_parse" }
2223
rustc_session = { path = "../rustc_session" }

‎compiler/rustc_builtin_macros/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use crate::deriving::*;
2424
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
2525
use rustc_expand::base::{MacroExpanderFn, ResolverExpand, SyntaxExtensionKind};
2626
use rustc_expand::proc_macro::BangProcMacro;
27-
use rustc_macros::fluent_messages;
27+
use rustc_fluent_macro::fluent_messages;
2828
use rustc_span::symbol::sym;
2929

3030
mod alloc_error_handler;

0 commit comments

Comments
 (0)