Skip to content

Commit 66daca1

Browse files
committed
Auto merge of #152163 - JonathanBrouwer:rollup-Ypg7w4H, r=JonathanBrouwer
Rollup of 9 pull requests Successful merges: - #150831 (c-variadic: make `va_arg` match on `Arch` exhaustive) - #152113 (Fix GitHub CI summary in CodeBuild) - #152153 (Incorporate query description functions into `QueryVTable`) - #152070 (Convert to inline diagnostics in `rustc_pattern_analysis`) - #152106 (Convert to inline diagnostics in `rustc_ast_passes`) - #152109 (Convert to inline diagnostics in `rustc_errors`) - #152119 (Convert to inline diagnostics in `rustc_middle`) - #152121 (Convert to inline diagnostics in `rustc_builtin_macros`) - #152133 (library/std: Rename `ON_BROKEN_PIPE_FLAG_USED` to `ON_BROKEN_PIPE_USED`) Failed merges: - #152107 (Convert to inline diagnostics in `rustc_borrowck`) - #152117 (Convert to inline diagnostics in `rustc_trait_selection`) - #152126 (Convert to inline diagnostics in `rustc_mir_build`) - #152131 (Port rustc_no_implicit_bounds attribute to parser.)
2 parents 0a13b43 + cb77fcb commit 66daca1

File tree

37 files changed

+939
-1499
lines changed

37 files changed

+939
-1499
lines changed

Cargo.lock

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3514,7 +3514,6 @@ dependencies = [
35143514
"rustc_data_structures",
35153515
"rustc_errors",
35163516
"rustc_feature",
3517-
"rustc_fluent_macro",
35183517
"rustc_macros",
35193518
"rustc_session",
35203519
"rustc_span",
@@ -3600,7 +3599,6 @@ dependencies = [
36003599
"rustc_errors",
36013600
"rustc_expand",
36023601
"rustc_feature",
3603-
"rustc_fluent_macro",
36043602
"rustc_hir",
36053603
"rustc_index",
36063604
"rustc_lexer",
@@ -3772,10 +3770,8 @@ dependencies = [
37723770
"libc",
37733771
"rustc_abi",
37743772
"rustc_ast",
3775-
"rustc_ast_passes",
37763773
"rustc_ast_pretty",
37773774
"rustc_borrowck",
3778-
"rustc_builtin_macros",
37793775
"rustc_codegen_ssa",
37803776
"rustc_const_eval",
37813777
"rustc_data_structures",
@@ -3796,7 +3792,6 @@ dependencies = [
37963792
"rustc_mir_transform",
37973793
"rustc_parse",
37983794
"rustc_passes",
3799-
"rustc_pattern_analysis",
38003795
"rustc_public",
38013796
"rustc_resolve",
38023797
"rustc_session",
@@ -3846,7 +3841,6 @@ dependencies = [
38463841
"rustc_data_structures",
38473842
"rustc_error_codes",
38483843
"rustc_error_messages",
3849-
"rustc_fluent_macro",
38503844
"rustc_hashes",
38513845
"rustc_index",
38523846
"rustc_lint_defs",
@@ -4262,7 +4256,6 @@ dependencies = [
42624256
"rustc_error_messages",
42634257
"rustc_errors",
42644258
"rustc_feature",
4265-
"rustc_fluent_macro",
42664259
"rustc_graphviz",
42674260
"rustc_hashes",
42684261
"rustc_hir",
@@ -4451,7 +4444,6 @@ dependencies = [
44514444
"rustc_arena",
44524445
"rustc_data_structures",
44534446
"rustc_errors",
4454-
"rustc_fluent_macro",
44554447
"rustc_hir",
44564448
"rustc_index",
44574449
"rustc_macros",

compiler/rustc_ast_passes/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ rustc_attr_parsing = { path = "../rustc_attr_parsing" }
1313
rustc_data_structures = { path = "../rustc_data_structures" }
1414
rustc_errors = { path = "../rustc_errors" }
1515
rustc_feature = { path = "../rustc_feature" }
16-
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1716
rustc_macros = { path = "../rustc_macros" }
1817
rustc_session = { path = "../rustc_session" }
1918
rustc_span = { path = "../rustc_span" }

0 commit comments

Comments
 (0)