Rollup of 18 pull requests #152147

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

Zalathar wants to merge 46 commits into rust-lang:main from Zalathar:rollup-zGqcIx0

+2,612 −3,878

Cargo.lock

-Original file line number
+Diff line change
@@ Expand Up / @@ -3490,7 +3490,6 @@ dependencies = [ @@
      "rustc_data_structures",
      "rustc_errors",
      "rustc_feature",
-     "rustc_fluent_macro",
      "rustc_hir",
      "rustc_index",
      "rustc_macros",
@@ Expand Down Expand Up / @@ -3672,7 +3671,6 @@ dependencies = [ @@
      "rustc_attr_parsing",
      "rustc_data_structures",
      "rustc_errors",
-     "rustc_fluent_macro",
      "rustc_fs_util",
      "rustc_hashes",
      "rustc_hir",
@@ Expand Down Expand Up / @@ -3774,7 +3772,6 @@ dependencies = [ @@
      "libc",
      "rustc_abi",
      "rustc_ast",
-     "rustc_ast_lowering",
      "rustc_ast_passes",
      "rustc_ast_pretty",
      "rustc_borrowck",
@@ Expand All / @@ -3787,7 +3784,6 @@ dependencies = [ @@
      "rustc_feature",
      "rustc_hir_analysis",
      "rustc_hir_pretty",
-     "rustc_hir_typeck",
      "rustc_index",
      "rustc_interface",
      "rustc_lexer",
@@ Expand Down Expand Up / @@ -3875,7 +3871,6 @@ dependencies = [ @@
      "rustc_data_structures",
      "rustc_errors",
      "rustc_feature",
-     "rustc_fluent_macro",
      "rustc_hir",
      "rustc_lexer",
      "rustc_lint_defs",
@@ Expand Down Expand Up / @@ -4017,7 +4012,6 @@ dependencies = [ @@
      "rustc_ast",
      "rustc_data_structures",
      "rustc_errors",
-     "rustc_fluent_macro",
      "rustc_hir",
      "rustc_hir_analysis",
      "rustc_hir_pretty",
@@ Expand All / @@ -4039,7 +4033,6 @@ name = "rustc_incremental" @@
     version = "0.0.0"
     dependencies = [
      "rand 0.9.2",
-     "rustc_ast",
      "rustc_data_structures",
      "rustc_errors",
      "rustc_fs_util",
@@ Expand All / @@ -4051,7 +4044,6 @@ dependencies = [ @@
      "rustc_serialize",
      "rustc_session",
      "rustc_span",
-     "thin-vec",
      "tracing",
     ]
@@ Expand Down Expand Up / @@ -4237,7 +4229,6 @@ dependencies = [ @@
      "rustc_errors",
      "rustc_expand",
      "rustc_feature",
-     "rustc_fluent_macro",
      "rustc_fs_util",
      "rustc_hir",
      "rustc_hir_pretty",
@@ Expand Down Expand Up / @@ -4347,7 +4338,6 @@ dependencies = [ @@
      "rustc_const_eval",
      "rustc_data_structures",
      "rustc_errors",
-     "rustc_fluent_macro",
      "rustc_hir",
      "rustc_index",
      "rustc_infer",
@@ Expand Down Expand Up / @@ -4534,9 +4524,11 @@ version = "0.0.0" @@
     dependencies = [
      "measureme",
      "rustc_data_structures",
+     "rustc_errors",
      "rustc_hashes",
      "rustc_hir",
      "rustc_index",
+     "rustc_macros",
      "rustc_middle",
      "rustc_query_system",
      "rustc_serialize",
@@ Expand Down Expand Up / @@ -4581,7 +4573,6 @@ dependencies = [ @@
      "rustc_errors",
      "rustc_expand",
      "rustc_feature",
-     "rustc_fluent_macro",
      "rustc_hir",
      "rustc_index",
      "rustc_macros",
@@ Expand Down @@

compiler/rustc/src/main.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,6 +3,8 @@
  
    // Several crates are depended upon but unused so that they are present in the sysroot

    #![expect(unused_crate_dependencies)]

    use std::process::ExitCode;

    // A note about jemalloc: rustc uses jemalloc when built for CI and

    // distribution. The obvious way to do this is with the `#[global_allocator]`

    // mechanism. However, for complicated reasons (see

    @@ -38,6 +40,6 @@
  
    #[cfg(feature = "jemalloc")]

    use tikv_jemalloc_sys as _;

    fn main() {

    fn main() -> ExitCode {

        rustc_driver::main()

    }

compiler/rustc_ast_lowering/Cargo.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ rustc_attr_parsing = { path = "../rustc_attr_parsing" } @@
     rustc_data_structures = { path = "../rustc_data_structures" }
     rustc_errors = { path = "../rustc_errors" }
     rustc_feature = { path = "../rustc_feature" }
-    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_ast_lowering/messages.ftl

This file was deleted.

compiler/rustc_ast_lowering/src/asm.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,6 +3,7 @@ use std::fmt::Write;
  
    use rustc_ast::*;

    use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap};

    use rustc_errors::inline_fluent;

    use rustc_hir as hir;

    use rustc_hir::def::{DefKind, Res};

    use rustc_session::parse::feature_err;

    @@ -19,8 +20,7 @@ use super::errors::{
  
        RegisterConflict,

    };

    use crate::{

        AllowReturnTypeNotation, ImplTraitContext, ImplTraitPosition, ParamMode,

        ResolverAstLoweringExt, fluent_generated as fluent,

        AllowReturnTypeNotation, ImplTraitContext, ImplTraitPosition, ParamMode, ResolverAstLoweringExt,

    };

    impl<'a, 'hir> LoweringContext<'a, 'hir> {

    @@ -67,7 +67,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  
                        &self.tcx.sess,

                        sym::asm_experimental_arch,

                        sp,

                        fluent::ast_lowering_unstable_inline_assembly,

                        inline_fluent!("inline assembly is not stable yet on this architecture"),

                    )

                    .emit();

                }

    @@ -84,7 +84,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  
                    &self.tcx.sess,

                    sym::asm_unwind,

                    sp,

                    fluent::ast_lowering_unstable_may_unwind,

                    inline_fluent!("the `may_unwind` option is unstable"),

                )

                .emit();

            }

    @@ -499,7 +499,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
  
                        sess,

                        sym::asm_goto_with_outputs,

                        *op_sp,

                        fluent::ast_lowering_unstable_inline_assembly_label_operand_with_outputs,

                        inline_fluent!(

                            "using both label and output operands for inline assembly is unstable"

                        ),

                    )

                    .emit();

                }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 18 pull requests #152147

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!