Rollup of 8 pull requests #152094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

JonathanBrouwer wants to merge 20 commits into rust-lang:main from JonathanBrouwer:rollup-ngdGvec

Cargo.lock

-Original file line number
+Diff line change
@@ Expand Up / @@ -3799,18 +3799,15 @@ dependencies = [ @@
      "rustc_middle",
      "rustc_mir_build",
      "rustc_mir_transform",
-     "rustc_monomorphize",
      "rustc_parse",
      "rustc_passes",
      "rustc_pattern_analysis",
-     "rustc_privacy",
      "rustc_public",
      "rustc_resolve",
      "rustc_session",
      "rustc_span",
      "rustc_target",
      "rustc_trait_selection",
-     "rustc_ty_utils",
      "serde_json",
      "shlex",
      "tracing",
@@ Expand Down Expand Up / @@ -4374,7 +4371,6 @@ dependencies = [ @@
      "rustc_abi",
      "rustc_data_structures",
      "rustc_errors",
-     "rustc_fluent_macro",
      "rustc_hir",
      "rustc_index",
      "rustc_macros",
@@ Expand Down Expand Up / @@ -4487,7 +4483,6 @@ dependencies = [ @@
      "rustc_ast",
      "rustc_data_structures",
      "rustc_errors",
-     "rustc_fluent_macro",
      "rustc_hir",
      "rustc_macros",
      "rustc_middle",
@@ Expand Down Expand Up / @@ -4642,7 +4637,6 @@ dependencies = [ @@
      "rustc_data_structures",
      "rustc_errors",
      "rustc_feature",
-     "rustc_fluent_macro",
      "rustc_fs_util",
      "rustc_hashes",
      "rustc_hir",
@@ Expand Down Expand Up / @@ -4798,7 +4792,6 @@ dependencies = [ @@
      "rustc_abi",
      "rustc_data_structures",
      "rustc_errors",
-     "rustc_fluent_macro",
      "rustc_hashes",
      "rustc_hir",
      "rustc_index",
@@ Expand Down @@

compiler/rustc_driver_impl/Cargo.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -33,18 +33,15 @@ rustc_metadata = { path = "../rustc_metadata" } @@
     rustc_middle = { path = "../rustc_middle" }
     rustc_mir_build = { path = "../rustc_mir_build" }
     rustc_mir_transform = { path = "../rustc_mir_transform" }
-    rustc_monomorphize = { path = "../rustc_monomorphize" }
     rustc_parse = { path = "../rustc_parse" }
     rustc_passes = { path = "../rustc_passes" }
     rustc_pattern_analysis = { path = "../rustc_pattern_analysis" }
-    rustc_privacy = { path = "../rustc_privacy" }
     rustc_public = { path = "../rustc_public", features = ["rustc_internal"] }
     rustc_resolve = { path = "../rustc_resolve" }
     rustc_session = { path = "../rustc_session" }
     rustc_span = { path = "../rustc_span" }
     rustc_target = { path = "../rustc_target" }
     rustc_trait_selection = { path = "../rustc_trait_selection" }
-    rustc_ty_utils = { path = "../rustc_ty_utils" }
     serde_json = "1.0.59"
     shlex = "1.0"
     tracing = { version = "0.1.35" }
@@ Expand Down @@

compiler/rustc_driver_impl/src/lib.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -130,15 +130,11 @@ pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[ @@
         rustc_middle::DEFAULT_LOCALE_RESOURCE,
         rustc_mir_build::DEFAULT_LOCALE_RESOURCE,
         rustc_mir_transform::DEFAULT_LOCALE_RESOURCE,
-        rustc_monomorphize::DEFAULT_LOCALE_RESOURCE,
         rustc_parse::DEFAULT_LOCALE_RESOURCE,
         rustc_passes::DEFAULT_LOCALE_RESOURCE,
         rustc_pattern_analysis::DEFAULT_LOCALE_RESOURCE,
-        rustc_privacy::DEFAULT_LOCALE_RESOURCE,
         rustc_resolve::DEFAULT_LOCALE_RESOURCE,
-        rustc_session::DEFAULT_LOCALE_RESOURCE,
         rustc_trait_selection::DEFAULT_LOCALE_RESOURCE,
-        rustc_ty_utils::DEFAULT_LOCALE_RESOURCE,
         // tidy-alphabetical-end
     ];
@@ Expand Down @@

compiler/rustc_interface/src/interface.rs

-Original file line number
+Diff line change
@@ Expand Up @@
         cfgs.into_iter()
             .map(|s| {
                 let psess = ParseSess::emitter_with_note(
-                    vec![
-                        crate::DEFAULT_LOCALE_RESOURCE,
-                        rustc_parse::DEFAULT_LOCALE_RESOURCE,
-                        rustc_session::DEFAULT_LOCALE_RESOURCE,
-                    ],
+                    vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE],
                     format!("this occurred on the command line: `--cfg={s}`"),
                 );
                 let filename = FileName::cfg_spec_source_code(&s);
@@ Expand Down Expand Up @@
         for s in specs {
             let psess = ParseSess::emitter_with_note(
-                vec![
-                    crate::DEFAULT_LOCALE_RESOURCE,
-                    rustc_parse::DEFAULT_LOCALE_RESOURCE,
-                    rustc_session::DEFAULT_LOCALE_RESOURCE,
-                ],
+                vec![crate::DEFAULT_LOCALE_RESOURCE, rustc_parse::DEFAULT_LOCALE_RESOURCE],
                 format!("this occurred on the command line: `--check-cfg={s}`"),
             );
             let filename = FileName::cfg_spec_source_code(&s);
@@ Expand Down @@

compiler/rustc_monomorphize/Cargo.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ edition = "2024" @@
     rustc_abi = { path = "../rustc_abi" }
     rustc_data_structures = { path = "../rustc_data_structures" }
     rustc_errors = { path = "../rustc_errors" }
-    rustc_fluent_macro = { path = "../rustc_fluent_macro" }
     rustc_hir = { path = "../rustc_hir" }
     rustc_index = { path = "../rustc_index" }
     rustc_macros = { path = "../rustc_macros" }
@@ Expand Down @@

compiler/rustc_monomorphize/messages.ftl

This file was deleted.

Provide feedback