Skip to content

Commit e1eaa2d

Browse files
committed
Auto merge of rust-lang#107738 - matthiaskrgr:rollup-o18lzi8, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#106477 (Refine error spans for "The trait bound `T: Trait` is not satisfied" when passing literal structs/tuples) - rust-lang#107596 (Add nicer output to PGO build timer) - rust-lang#107692 (Sort Generator `print-type-sizes` according to their yield points) - rust-lang#107714 (Clarify wording on f64::round() and f32::round()) - rust-lang#107720 (end entry paragraph with a period (.)) - rust-lang#107724 (remove unused rustc_* imports) - rust-lang#107725 (Turn MarkdownWithToc into a struct with named fields) - rust-lang#107731 (interpret: move discriminant reading and writing to separate file) - rust-lang#107735 (Add mailmap for commits made by [email protected]) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7ff69b4 + 5e95829 commit e1eaa2d

File tree

46 files changed

+1536
-425
lines changed

Some content is hidden

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

46 files changed

+1536
-425
lines changed

.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ Eduard-Mihai Burtescu <[email protected]>
166166
Eduardo Bautista <[email protected]> <=>
167167
168168
Eduardo Broto <[email protected]>
169+
169170
170171
Elly Fong-Jones <[email protected]>
171172

Cargo.lock

-17
Original file line numberDiff line numberDiff line change
@@ -3689,7 +3689,6 @@ dependencies = [
36893689
name = "rustc_ast_lowering"
36903690
version = "0.0.0"
36913691
dependencies = [
3692-
"rustc_arena",
36933692
"rustc_ast",
36943693
"rustc_ast_pretty",
36953694
"rustc_data_structures",
@@ -3698,7 +3697,6 @@ dependencies = [
36983697
"rustc_index",
36993698
"rustc_macros",
37003699
"rustc_middle",
3701-
"rustc_query_system",
37023700
"rustc_session",
37033701
"rustc_span",
37043702
"rustc_target",
@@ -3731,7 +3729,6 @@ name = "rustc_ast_pretty"
37313729
version = "0.0.0"
37323730
dependencies = [
37333731
"rustc_ast",
3734-
"rustc_parse_format",
37353732
"rustc_span",
37363733
]
37373734

@@ -3838,7 +3835,6 @@ dependencies = [
38383835
"rustc_metadata",
38393836
"rustc_middle",
38403837
"rustc_query_system",
3841-
"rustc_serialize",
38423838
"rustc_session",
38433839
"rustc_span",
38443840
"rustc_symbol_mangling",
@@ -3864,7 +3860,6 @@ dependencies = [
38643860
"rustc_arena",
38653861
"rustc_ast",
38663862
"rustc_attr",
3867-
"rustc_const_eval",
38683863
"rustc_data_structures",
38693864
"rustc_errors",
38703865
"rustc_fs_util",
@@ -3905,7 +3900,6 @@ dependencies = [
39053900
"rustc_macros",
39063901
"rustc_middle",
39073902
"rustc_mir_dataflow",
3908-
"rustc_query_system",
39093903
"rustc_session",
39103904
"rustc_span",
39113905
"rustc_target",
@@ -4100,15 +4094,12 @@ dependencies = [
41004094
"rustc_data_structures",
41014095
"rustc_errors",
41024096
"rustc_feature",
4103-
"rustc_graphviz",
41044097
"rustc_hir",
4105-
"rustc_hir_pretty",
41064098
"rustc_index",
41074099
"rustc_infer",
41084100
"rustc_lint",
41094101
"rustc_macros",
41104102
"rustc_middle",
4111-
"rustc_serialize",
41124103
"rustc_session",
41134104
"rustc_span",
41144105
"rustc_target",
@@ -4195,7 +4186,6 @@ dependencies = [
41954186
"rustc_macros",
41964187
"rustc_middle",
41974188
"rustc_serialize",
4198-
"rustc_session",
41994189
"rustc_span",
42004190
"rustc_target",
42014191
"smallvec",
@@ -4238,7 +4228,6 @@ dependencies = [
42384228
"rustc_privacy",
42394229
"rustc_query_impl",
42404230
"rustc_resolve",
4241-
"rustc_serialize",
42424231
"rustc_session",
42434232
"rustc_span",
42444233
"rustc_symbol_mangling",
@@ -4404,7 +4393,6 @@ dependencies = [
44044393
"rustc_apfloat",
44054394
"rustc_arena",
44064395
"rustc_ast",
4407-
"rustc_attr",
44084396
"rustc_data_structures",
44094397
"rustc_errors",
44104398
"rustc_hir",
@@ -4436,7 +4424,6 @@ dependencies = [
44364424
"rustc_macros",
44374425
"rustc_middle",
44384426
"rustc_serialize",
4439-
"rustc_session",
44404427
"rustc_span",
44414428
"rustc_target",
44424429
"smallvec",
@@ -4567,7 +4554,6 @@ dependencies = [
45674554
"rustc_middle",
45684555
"rustc_session",
45694556
"rustc_span",
4570-
"rustc_trait_selection",
45714557
"tracing",
45724558
]
45734559

@@ -4588,7 +4574,6 @@ dependencies = [
45884574
"rustc_serialize",
45894575
"rustc_session",
45904576
"rustc_span",
4591-
"rustc_target",
45924577
"thin-vec",
45934578
"tracing",
45944579
]
@@ -4789,7 +4774,6 @@ dependencies = [
47894774
"rustc_hir",
47904775
"rustc_index",
47914776
"rustc_infer",
4792-
"rustc_lint_defs",
47934777
"rustc_macros",
47944778
"rustc_middle",
47954779
"rustc_parse_format",
@@ -4811,7 +4795,6 @@ dependencies = [
48114795
"chalk-ir",
48124796
"chalk-solve",
48134797
"rustc_ast",
4814-
"rustc_attr",
48154798
"rustc_data_structures",
48164799
"rustc_hir",
48174800
"rustc_index",

compiler/rustc_ast_lowering/Cargo.toml

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

99
[dependencies]
10-
rustc_arena = { path = "../rustc_arena" }
1110
rustc_ast = { path = "../rustc_ast" }
1211
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1312
rustc_data_structures = { path = "../rustc_data_structures" }
@@ -16,7 +15,6 @@ rustc_hir = { path = "../rustc_hir" }
1615
rustc_index = { path = "../rustc_index" }
1716
rustc_middle = { path = "../rustc_middle" }
1817
rustc_macros = { path = "../rustc_macros" }
19-
rustc_query_system = { path = "../rustc_query_system" }
2018
rustc_session = { path = "../rustc_session" }
2119
rustc_span = { path = "../rustc_span" }
2220
rustc_target = { path = "../rustc_target" }

compiler/rustc_ast_pretty/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ edition = "2021"
77

88
[dependencies]
99
rustc_ast = { path = "../rustc_ast" }
10-
rustc_parse_format = { path = "../rustc_parse_format" }
1110
rustc_span = { path = "../rustc_span" }

compiler/rustc_codegen_llvm/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ rustc_macros = { path = "../rustc_macros" }
3030
rustc_metadata = { path = "../rustc_metadata" }
3131
rustc_query_system = { path = "../rustc_query_system" }
3232
rustc_session = { path = "../rustc_session" }
33-
rustc_serialize = { path = "../rustc_serialize" }
3433
rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
3534
rustc_target = { path = "../rustc_target" }
3635
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }

compiler/rustc_codegen_ssa/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ rustc_metadata = { path = "../rustc_metadata" }
4141
rustc_query_system = { path = "../rustc_query_system" }
4242
rustc_target = { path = "../rustc_target" }
4343
rustc_session = { path = "../rustc_session" }
44-
rustc_const_eval = { path = "../rustc_const_eval" }
4544

4645
[dependencies.object]
4746
version = "0.30.1"

compiler/rustc_const_eval/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ rustc_infer = { path = "../rustc_infer" }
1919
rustc_macros = { path = "../rustc_macros" }
2020
rustc_middle = { path = "../rustc_middle" }
2121
rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
22-
rustc_query_system = { path = "../rustc_query_system" }
2322
rustc_session = { path = "../rustc_session" }
2423
rustc_target = { path = "../rustc_target" }
2524
rustc_trait_selection = { path = "../rustc_trait_selection" }

0 commit comments

Comments
 (0)