Skip to content

Commit ccf8839

Browse files
Rollup merge of rust-lang#152068 - JonathanBrouwer:convert_resolve, r=lqd
Convert to inline diagnostics in `rustc_resolve` For rust-lang#151366
2 parents e999970 + 024c9b7 commit ccf8839

6 files changed

Lines changed: 310 additions & 778 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4586,7 +4586,6 @@ dependencies = [
45864586
"rustc_errors",
45874587
"rustc_expand",
45884588
"rustc_feature",
4589-
"rustc_fluent_macro",
45904589
"rustc_hir",
45914590
"rustc_index",
45924591
"rustc_macros",

compiler/rustc_driver_impl/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[
134134
rustc_passes::DEFAULT_LOCALE_RESOURCE,
135135
rustc_pattern_analysis::DEFAULT_LOCALE_RESOURCE,
136136
rustc_privacy::DEFAULT_LOCALE_RESOURCE,
137-
rustc_resolve::DEFAULT_LOCALE_RESOURCE,
138137
rustc_session::DEFAULT_LOCALE_RESOURCE,
139138
rustc_trait_selection::DEFAULT_LOCALE_RESOURCE,
140139
// tidy-alphabetical-end

compiler/rustc_resolve/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ rustc_data_structures = { path = "../rustc_data_structures" }
1616
rustc_errors = { path = "../rustc_errors" }
1717
rustc_expand = { path = "../rustc_expand" }
1818
rustc_feature = { path = "../rustc_feature" }
19-
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
2019
rustc_hir = { path = "../rustc_hir" }
2120
rustc_index = { path = "../rustc_index" }
2221
rustc_macros = { path = "../rustc_macros" }

0 commit comments

Comments
 (0)