Skip to content

Commit 2a7761a

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#117068
Rollup merge of rust-lang#117068 - nnethercote:clean-up-Cargo-toml, r=wesleywiser Clean up `compiler/rustc*/Cargo.toml` Mostly by sorting dependencies, plus some other minor things. r? ``@wesleywiser``
2 parents e6e931d + 8ff624a commit 2a7761a

File tree

65 files changed

+400
-303
lines changed

Some content is hidden

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

65 files changed

+400
-303
lines changed

‎Cargo.lock

-1
Original file line numberDiff line numberDiff line change
@@ -4412,7 +4412,6 @@ version = "0.0.0"
44124412
dependencies = [
44134413
"field-offset",
44144414
"measureme",
4415-
"memoffset",
44164415
"rustc-rayon-core",
44174416
"rustc_data_structures",
44184417
"rustc_errors",

‎compiler/rustc/Cargo.toml

+10-3
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,31 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7-
rustc_driver = { path = "../rustc_driver" }
8-
rustc_driver_impl = { path = "../rustc_driver_impl" }
7+
# tidy-alphabetical-start
98

109
# Make sure rustc_codegen_ssa ends up in the sysroot, because this
1110
# crate is intended to be used by codegen backends, which may not be in-tree.
1211
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
12+
13+
rustc_driver = { path = "../rustc_driver" }
14+
rustc_driver_impl = { path = "../rustc_driver_impl" }
15+
1316
# Make sure rustc_smir ends up in the sysroot, because this
14-
# crate is intended to be used by stable MIR consumers, which are not in-tree
17+
# crate is intended to be used by stable MIR consumers, which are not in-tree.
1518
rustc_smir = { path = "../rustc_smir" }
19+
1620
stable_mir = { path = "../stable_mir" }
21+
# tidy-alphabetical-end
1722

1823
[dependencies.jemalloc-sys]
1924
version = "0.5.0"
2025
optional = true
2126
features = ['unprefixed_malloc_on_supported_platforms']
2227

2328
[features]
29+
# tidy-alphabetical-start
2430
jemalloc = ['jemalloc-sys']
2531
llvm = ['rustc_driver_impl/llvm']
2632
max_level_info = ['rustc_driver_impl/max_level_info']
2733
rustc_use_parallel_compiler = ['rustc_driver_impl/rustc_use_parallel_compiler']
34+
# tidy-alphabetical-end

‎compiler/rustc_abi/Cargo.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7+
# tidy-alphabetical-start
78
bitflags = "1.2.1"
8-
tracing = "0.1"
99
rand = { version = "0.8.4", default-features = false, optional = true }
1010
rand_xoshiro = { version = "0.6.0", optional = true }
1111
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
1212
rustc_index = { path = "../rustc_index", default-features = false }
1313
rustc_macros = { path = "../rustc_macros", optional = true }
1414
rustc_serialize = { path = "../rustc_serialize", optional = true }
15+
tracing = "0.1"
16+
# tidy-alphabetical-end
1517

1618
[features]
19+
# tidy-alphabetical-start
1720
default = ["nightly", "randomize"]
18-
randomize = ["rand", "rand_xoshiro", "nightly"]
1921
# rust-analyzer depends on this crate and we therefore require it to built on a stable toolchain
2022
# without depending on rustc_data_structures, rustc_macros and rustc_serialize
2123
nightly = [
@@ -24,3 +26,5 @@ nightly = [
2426
"rustc_macros",
2527
"rustc_serialize",
2628
]
29+
randomize = ["rand", "rand_xoshiro", "nightly"]
30+
# tidy-alphabetical-end

‎compiler/rustc_arena/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7+
# tidy-alphabetical-start
78
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
9+
# tidy-alphabetical-end

‎compiler/rustc_ast/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ name = "rustc_ast"
33
version = "0.0.0"
44
edition = "2021"
55

6-
[lib]
7-
86
[dependencies]
7+
# tidy-alphabetical-start
98
bitflags = "1.2.1"
109
memchr = "2.5.0"
1110
rustc_data_structures = { path = "../rustc_data_structures" }
@@ -14,8 +13,9 @@ rustc_lexer = { path = "../rustc_lexer" }
1413
rustc_macros = { path = "../rustc_macros" }
1514
rustc_serialize = { path = "../rustc_serialize" }
1615
rustc_span = { path = "../rustc_span" }
17-
# depends on Mutability and Movability, which could be uplifted into a common crate.
16+
# For Mutability and Movability, which could be uplifted into a common crate.
1817
rustc_type_ir = { path = "../rustc_type_ir" }
1918
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
2019
thin-vec = "0.2.12"
2120
tracing = "0.1"
21+
# tidy-alphabetical-end

‎compiler/rustc_ast_lowering/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,20 @@ edition = "2021"
77
doctest = false
88

99
[dependencies]
10+
# tidy-alphabetical-start
1011
rustc_ast = { path = "../rustc_ast" }
1112
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1213
rustc_data_structures = { path = "../rustc_data_structures" }
1314
rustc_errors = { path = "../rustc_errors" }
14-
rustc_hir = { path = "../rustc_hir" }
1515
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
16+
rustc_hir = { path = "../rustc_hir" }
1617
rustc_index = { path = "../rustc_index" }
17-
rustc_middle = { path = "../rustc_middle" }
1818
rustc_macros = { path = "../rustc_macros" }
19+
rustc_middle = { path = "../rustc_middle" }
1920
rustc_session = { path = "../rustc_session" }
2021
rustc_span = { path = "../rustc_span" }
2122
rustc_target = { path = "../rustc_target" }
2223
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
2324
thin-vec = "0.2.12"
2425
tracing = "0.1"
26+
# tidy-alphabetical-end

‎compiler/rustc_ast_passes/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7+
# tidy-alphabetical-start
78
itertools = "0.10.1"
89
rustc_ast = { path = "../rustc_ast" }
910
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1011
rustc_attr = { path = "../rustc_attr" }
1112
rustc_data_structures = { path = "../rustc_data_structures" }
1213
rustc_errors = { path = "../rustc_errors" }
1314
rustc_feature = { path = "../rustc_feature" }
14-
rustc_macros = { path = "../rustc_macros" }
1515
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
16+
rustc_macros = { path = "../rustc_macros" }
1617
rustc_parse = { path = "../rustc_parse" }
1718
rustc_session = { path = "../rustc_session" }
1819
rustc_span = { path = "../rustc_span" }
1920
rustc_target = { path = "../rustc_target" }
2021
thin-vec = "0.2.12"
2122
tracing = "0.1"
23+
# tidy-alphabetical-end

‎compiler/rustc_ast_pretty/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name = "rustc_ast_pretty"
33
version = "0.0.0"
44
edition = "2021"
55

6-
[lib]
7-
86
[dependencies]
7+
# tidy-alphabetical-start
98
rustc_ast = { path = "../rustc_ast" }
109
rustc_span = { path = "../rustc_span" }
1110
thin-vec = "0.2.12"
11+
# tidy-alphabetical-end

‎compiler/rustc_attr/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ name = "rustc_attr"
33
version = "0.0.0"
44
edition = "2021"
55

6-
[lib]
7-
86
[dependencies]
7+
# tidy-alphabetical-start
98
rustc_ast = { path = "../rustc_ast" }
109
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1110
rustc_data_structures = { path = "../rustc_data_structures" }
@@ -17,3 +16,4 @@ rustc_macros = { path = "../rustc_macros" }
1716
rustc_serialize = { path = "../rustc_serialize" }
1817
rustc_session = { path = "../rustc_session" }
1918
rustc_span = { path = "../rustc_span" }
19+
# tidy-alphabetical-end

‎compiler/rustc_baked_icu_data/Cargo.toml

+4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7+
# tidy-alphabetical-start
78
icu_list = "1.2"
89
icu_locid = "1.2"
910
icu_provider = "1.2"
1011
icu_provider_adapters = "1.2"
1112
zerovec = "0.9.4"
13+
# tidy-alphabetical-end
1214

1315
[features]
16+
# tidy-alphabetical-start
1417
rustc_use_parallel_compiler = ['icu_provider/sync']
18+
# tidy-alphabetical-end

‎compiler/rustc_borrowck/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@ name = "rustc_borrowck"
33
version = "0.0.0"
44
edition = "2021"
55

6-
[lib]
7-
86
[dependencies]
7+
# tidy-alphabetical-start
98
either = "1.5.0"
109
itertools = "0.10.1"
11-
tracing = "0.1"
1210
polonius-engine = "0.13.0"
13-
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
1411
rustc_data_structures = { path = "../rustc_data_structures" }
1512
rustc_errors = { path = "../rustc_errors" }
13+
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1614
rustc_graphviz = { path = "../rustc_graphviz" }
1715
rustc_hir = { path = "../rustc_hir" }
18-
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1916
rustc_index = { path = "../rustc_index" }
2017
rustc_infer = { path = "../rustc_infer" }
2118
rustc_lexer = { path = "../rustc_lexer" }
@@ -24,7 +21,10 @@ rustc_middle = { path = "../rustc_middle" }
2421
rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
2522
rustc_serialize = { path = "../rustc_serialize" }
2623
rustc_session = { path = "../rustc_session" }
24+
rustc_span = { path = "../rustc_span" }
2725
rustc_target = { path = "../rustc_target" }
2826
rustc_trait_selection = { path = "../rustc_trait_selection" }
2927
rustc_traits = { path = "../rustc_traits" }
30-
rustc_span = { path = "../rustc_span" }
28+
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
29+
tracing = "0.1"
30+
# tidy-alphabetical-end

‎compiler/rustc_builtin_macros/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,25 @@ edition = "2021"
77
doctest = false
88

99
[dependencies]
10+
# tidy-alphabetical-start
1011
rustc_ast = { path = "../rustc_ast" }
1112
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1213
rustc_attr = { path = "../rustc_attr" }
1314
rustc_data_structures = { path = "../rustc_data_structures" }
1415
rustc_errors = { path = "../rustc_errors" }
1516
rustc_expand = { path = "../rustc_expand" }
1617
rustc_feature = { path = "../rustc_feature" }
18+
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1719
rustc_index = { path = "../rustc_index" }
1820
rustc_lexer = { path = "../rustc_lexer" }
1921
rustc_lint_defs = { path = "../rustc_lint_defs" }
2022
rustc_macros = { path = "../rustc_macros" }
21-
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
22-
rustc_parse_format = { path = "../rustc_parse_format" }
2323
rustc_parse = { path = "../rustc_parse" }
24+
rustc_parse_format = { path = "../rustc_parse_format" }
2425
rustc_session = { path = "../rustc_session" }
2526
rustc_span = { path = "../rustc_span" }
2627
rustc_target = { path = "../rustc_target" }
2728
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
2829
thin-vec = "0.2.12"
2930
tracing = "0.1"
31+
# tidy-alphabetical-end

‎compiler/rustc_codegen_llvm/Cargo.toml

+8-9
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@ edition = "2021"
77
test = false
88

99
[dependencies]
10+
# tidy-alphabetical-start
1011
bitflags = "1.0"
1112
cstr = "0.2"
1213
itertools = "0.10.5"
1314
libc = "0.2"
1415
measureme = "10.0.0"
15-
object = { version = "0.32.0", default-features = false, features = [
16-
"std",
17-
"read",
18-
] }
19-
tracing = "0.1"
20-
rustc_middle = { path = "../rustc_middle" }
16+
object = { version = "0.32.0", default-features = false, features = ["std", "read"] }
2117
rustc-demangle = "0.1.21"
18+
rustc_ast = { path = "../rustc_ast" }
2219
rustc_attr = { path = "../rustc_attr" }
2320
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
2421
rustc_data_structures = { path = "../rustc_data_structures" }
@@ -30,12 +27,14 @@ rustc_index = { path = "../rustc_index" }
3027
rustc_llvm = { path = "../rustc_llvm" }
3128
rustc_macros = { path = "../rustc_macros" }
3229
rustc_metadata = { path = "../rustc_metadata" }
30+
rustc_middle = { path = "../rustc_middle" }
3331
rustc_query_system = { path = "../rustc_query_system" }
3432
rustc_session = { path = "../rustc_session" }
33+
rustc_span = { path = "../rustc_span" }
3534
rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
3635
rustc_target = { path = "../rustc_target" }
37-
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
38-
rustc_ast = { path = "../rustc_ast" }
39-
rustc_span = { path = "../rustc_span" }
4036
serde = { version = "1", features = [ "derive" ]}
4137
serde_json = "1"
38+
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
39+
tracing = "0.1"
40+
# tidy-alphabetical-end

‎compiler/rustc_codegen_ssa/Cargo.toml

+17-14
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,46 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7+
# tidy-alphabetical-start
78
ar_archive_writer = "0.1.5"
89
bitflags = "1.2.1"
910
cc = "1.0.69"
1011
itertools = "0.10.1"
11-
tracing = "0.1"
1212
jobserver = "0.1.22"
13-
tempfile = "3.2"
14-
thorin-dwp = "0.7"
1513
pathdiff = "0.2.0"
16-
serde_json = "1.0.59"
17-
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
1814
regex = "1.4"
19-
thin-vec = "0.2.12"
20-
21-
rustc_serialize = { path = "../rustc_serialize" }
2215
rustc_arena = { path = "../rustc_arena" }
2316
rustc_ast = { path = "../rustc_ast" }
24-
rustc_span = { path = "../rustc_span" }
25-
rustc_middle = { path = "../rustc_middle" }
26-
rustc_type_ir = { path = "../rustc_type_ir" }
2717
rustc_attr = { path = "../rustc_attr" }
28-
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
29-
rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
3018
rustc_data_structures = { path = "../rustc_data_structures" }
3119
rustc_errors = { path = "../rustc_errors" }
20+
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
3221
rustc_fs_util = { path = "../rustc_fs_util" }
3322
rustc_hir = { path = "../rustc_hir" }
3423
rustc_incremental = { path = "../rustc_incremental" }
3524
rustc_index = { path = "../rustc_index" }
3625
rustc_macros = { path = "../rustc_macros" }
3726
rustc_metadata = { path = "../rustc_metadata" }
27+
rustc_middle = { path = "../rustc_middle" }
3828
rustc_query_system = { path = "../rustc_query_system" }
39-
rustc_target = { path = "../rustc_target" }
29+
rustc_serialize = { path = "../rustc_serialize" }
4030
rustc_session = { path = "../rustc_session" }
31+
rustc_span = { path = "../rustc_span" }
32+
rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
33+
rustc_target = { path = "../rustc_target" }
34+
rustc_type_ir = { path = "../rustc_type_ir" }
35+
serde_json = "1.0.59"
36+
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
37+
tempfile = "3.2"
38+
thin-vec = "0.2.12"
39+
thorin-dwp = "0.7"
40+
tracing = "0.1"
41+
# tidy-alphabetical-end
4142

4243
[target.'cfg(unix)'.dependencies]
44+
# tidy-alphabetical-start
4345
libc = "0.2.50"
46+
# tidy-alphabetical-end
4447

4548
[dependencies.object]
4649
version = "0.32.0"

‎compiler/rustc_const_eval/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ name = "rustc_const_eval"
33
version = "0.0.0"
44
edition = "2021"
55

6-
[lib]
7-
86
[dependencies]
9-
tracing = "0.1"
7+
# tidy-alphabetical-start
108
either = "1"
119
rustc_apfloat = "0.2.0"
1210
rustc_ast = { path = "../rustc_ast" }
1311
rustc_attr = { path = "../rustc_attr" }
1412
rustc_data_structures = { path = "../rustc_data_structures" }
1513
rustc_errors = { path = "../rustc_errors" }
16-
rustc_hir = { path = "../rustc_hir" }
1714
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
15+
rustc_hir = { path = "../rustc_hir" }
1816
rustc_index = { path = "../rustc_index" }
1917
rustc_infer = { path = "../rustc_infer" }
2018
rustc_macros = { path = "../rustc_macros" }
2119
rustc_middle = { path = "../rustc_middle" }
2220
rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
2321
rustc_session = { path = "../rustc_session" }
22+
rustc_span = { path = "../rustc_span" }
2423
rustc_target = { path = "../rustc_target" }
2524
rustc_trait_selection = { path = "../rustc_trait_selection" }
26-
rustc_span = { path = "../rustc_span" }
2725
rustc_type_ir = { path = "../rustc_type_ir" }
26+
tracing = "0.1"
27+
# tidy-alphabetical-end

0 commit comments

Comments
 (0)