Rollup of 13 pull requests by JonathanBrouwer · Pull Request #152055 · rust-lang/rust

.github/workflows/ci.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -165,9 +165,6 @@ jobs: @@
           - name: install sccache
             run: src/ci/scripts/install-sccache.sh
-          - name: select Xcode
-            run: src/ci/scripts/select-xcode.sh
           - name: install clang
             run: src/ci/scripts/install-clang.sh
@@ Expand Down @@

Cargo.lock

-Original file line number
+Diff line change
@@ Expand Up / @@ -3543,7 +3543,6 @@ dependencies = [ @@
      "rustc_ast_pretty",
      "rustc_errors",
      "rustc_feature",
-     "rustc_fluent_macro",
      "rustc_hir",
      "rustc_lexer",
      "rustc_macros",
@@ Expand Down Expand Up / @@ -3684,7 +3683,6 @@ dependencies = [ @@
      "rustc_macros",
      "rustc_metadata",
      "rustc_middle",
-     "rustc_query_system",
      "rustc_serialize",
      "rustc_session",
      "rustc_span",
@@ Expand Down Expand Up / @@ -3780,7 +3778,6 @@ dependencies = [ @@
      "rustc_ast_lowering",
      "rustc_ast_passes",
      "rustc_ast_pretty",
-     "rustc_attr_parsing",
      "rustc_borrowck",
      "rustc_builtin_macros",
      "rustc_codegen_ssa",
@@ Expand All / @@ -3794,7 +3791,6 @@ dependencies = [ @@
      "rustc_hir_typeck",
      "rustc_incremental",
      "rustc_index",
-     "rustc_infer",
      "rustc_interface",
      "rustc_lexer",
      "rustc_lint",
@@ Expand All / @@ -3811,7 +3807,6 @@ dependencies = [ @@
      "rustc_pattern_analysis",
      "rustc_privacy",
      "rustc_public",
-     "rustc_query_system",
      "rustc_resolve",
      "rustc_session",
      "rustc_span",
@@ Expand Down Expand Up / @@ -4092,7 +4087,6 @@ version = "0.0.0" @@
     dependencies = [
      "rustc_data_structures",
      "rustc_errors",
-     "rustc_fluent_macro",
      "rustc_hir",
      "rustc_index",
      "rustc_macros",
@@ Expand Down Expand Up / @@ -4337,11 +4331,11 @@ dependencies = [ @@
      "polonius-engine",
      "regex",
      "rustc_abi",
-     "rustc_ast",
      "rustc_data_structures",
      "rustc_errors",
      "rustc_fluent_macro",
      "rustc_graphviz",
+     "rustc_hir",
      "rustc_index",
      "rustc_macros",
      "rustc_middle",
@@ Expand Down Expand Up / @@ -4571,7 +4565,6 @@ dependencies = [ @@
      "rustc_data_structures",
      "rustc_errors",
      "rustc_feature",
-     "rustc_fluent_macro",
      "rustc_hashes",
      "rustc_hir",
      "rustc_index",
@@ Expand Down @@

compiler/rustc_attr_parsing/Cargo.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ rustc_ast = { path = "../rustc_ast" } @@
     rustc_ast_pretty = { path = "../rustc_ast_pretty" }
     rustc_errors = { path = "../rustc_errors" }
     rustc_feature = { path = "../rustc_feature" }
-    rustc_fluent_macro = { path = "../rustc_fluent_macro" }
     rustc_hir = { path = "../rustc_hir" }
     rustc_lexer = { path = "../rustc_lexer" }
     rustc_macros = { path = "../rustc_macros" }
@@ Expand Down @@

compiler/rustc_attr_parsing/messages.ftl

This file was deleted.

compiler/rustc_attr_parsing/src/attributes/cfg.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,7 +3,7 @@ use std::convert::identity;
  
    use rustc_ast::token::Delimiter;

    use rustc_ast::tokenstream::DelimSpan;

    use rustc_ast::{AttrItem, Attribute, CRATE_NODE_ID, LitKind, ast, token};

    use rustc_errors::{Applicability, PResult};

    use rustc_errors::{Applicability, PResult, inline_fluent};

    use rustc_feature::{

        AttrSuggestionStyle, AttributeTemplate, Features, GatedCfg, find_gated_cfg, template,

    };

    @@ -25,7 +25,7 @@ use crate::session_diagnostics::{
  
        AttributeParseError, AttributeParseErrorReason, CfgAttrBadDelim, MetaBadDelimSugg,

        ParsedDescription,

    };

    use crate::{AttributeParser, fluent_generated, parse_version, session_diagnostics};

    use crate::{AttributeParser, parse_version, session_diagnostics};

    pub const CFG_TEMPLATE: AttributeTemplate = template!(

        List: &["predicate"],

    @@ -141,7 +141,7 @@ fn parse_cfg_entry_target<S: Stage>(
  
                cx.sess(),

                sym::cfg_target_compact,

                meta_span,

                fluent_generated::attr_parsing_unstable_cfg_target_compact,

                inline_fluent!("compact `cfg(target(..))` is experimental and subject to change"),

            )

            .emit();

        }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 13 pull requests #152055

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!