Rollup of 21 pull requests

.github/renovate.json5

@@ -9,6 +9,17 @@
     // (still gated by dashboard approval for now)
     ":maintainLockFilesMonthly",
   ],
+  // Cargo manifests in this repository use unstable features.
+  "env": {
+    "RUSTC_BOOTSTRAP": "1"
+  },
+  // The compiler and rustbook workspaces have path dependencies in these
+  // submodules.
+  "cloneSubmodules": true,
+  "cloneSubmodulesFilter": [
+    "src/doc/book",
+    "src/doc/reference"
+  ],
   // Require manual approval from the Dependency Dashboard before opening PRs
   "dependencyDashboardApproval": true,
   // Renovate shouldn't update a PR if it is in the bors merge queue.
@@ -18,6 +29,22 @@
       // No dashboard approval necessary for GitHub Actions updates
       "matchManagers": ["github-actions"],
       "dependencyDashboardApproval": false
+    },
+    {
+      // Only maintain the Cargo lockfiles managed by update-lockfile.sh.
+      "matchManagers": ["cargo"],
+      "matchUpdateTypes": ["lockFileMaintenance"],
+      "enabled": false
+    },
+    {
+      "matchManagers": ["cargo"],
+      "matchUpdateTypes": ["lockFileMaintenance"],
+      "matchFileNames": [
+        "Cargo.toml",
+        "library/Cargo.toml",
+        "src/tools/rustbook/Cargo.toml"
+      ],
+      "enabled": true
     }
   ],
   // Don't manage dependencies inside subtrees. They are updated upstream and

Cargo.lock

@@ -848,7 +848,7 @@ version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1261,7 +1261,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1388,7 +1388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2166,7 +2166,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde_core",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2653,7 +2653,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5084,7 +5084,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5516,7 +5516,7 @@ dependencies = [
  "getrandom 0.3.3",
  "once_cell",
  "rustix",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5535,7 +5535,7 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8c27177b12a6399ffc08b98f76f7c9a1f4fe9fc967c784c5a071fa8d93cf7e1"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5905,9 +5905,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -6513,7 +6513,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]

bootstrap.example.toml

@@ -351,6 +351,10 @@
 # Set this to "discover" to automatically discover LLDB from the environment.
 #build.lldb = "lldb"
 
+# The path to (or name of) the Intel SDE executable, used to run the
+# intrinsic-test suite for x86 target features the host CPU may not support.
+#build.sde = "sde64"
+
 # The node.js executable to use. Note that this is only used for the emscripten
 # target when running tests, otherwise this can be omitted.
 #build.nodejs = "node"

compiler/rustc_ast_lowering/src/lib.rs

@@ -291,7 +291,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             attribute_parser: AttributeParser::new(
                 tcx.sess,
                 tcx.features(),
-                tcx.registered_tools(()),
+                tcx.registered_attr_tools(()),
                 ShouldEmit::ErrorsAndLints { recovery: Recovery::Allowed },
             ),
             delayed_lints: Vec::new(),

compiler/rustc_ast_passes/src/feature_gate.rs

@@ -634,7 +634,7 @@ fn maybe_stage_features(sess: &Session, features: &Features, krate: &ast::Crate)
     let mut errored = false;
 
     if let Some(Attribute::Parsed(AttributeKind::Feature(feature_idents, first_span))) =
-        AttributeParser::parse_limited(sess, &krate.attrs, &[sym::feature])
+        AttributeParser::parse_limited_sym(sess, &krate.attrs, &[sym::feature])
     {
         // `feature(...)` used on non-nightly. This is definitely an error.
         let mut err = diagnostics::FeatureOnNonNightly {

compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs

@@ -280,7 +280,7 @@ impl AttributeParser for NakedParser {
 
         let span = self.span?;
 
-        let Some(tools) = cx.tools else {
+        let Some(tools) = cx.attr_tools else {
             unreachable!("tools required while parsing attributes");
         };
 

compiler/rustc_attr_parsing/src/attributes/crate_level.rs

@@ -1,11 +1,12 @@
+use rustc_data_structures::fx::FxIndexSet;
 use rustc_feature::AttributeStability;
 use rustc_hir::attrs::{CrateType, WindowsSubsystemKind};
 use rustc_session::lint::builtin::UNKNOWN_CRATE_TYPES;
 use rustc_span::Symbol;
 use rustc_span::edit_distance::find_best_match_for_name_with_substrings;
 
 use super::prelude::*;
-use crate::diagnostics::{UnknownCrateTypes, UnknownCrateTypesSuggestion};
+use crate::diagnostics::{ToolReserved, UnknownCrateTypes, UnknownCrateTypesSuggestion};
 
 pub(crate) struct CrateNameParser;
 
@@ -317,49 +318,87 @@ impl CombineAttributeParser for FeatureParser {
     }
 }
 
-pub(crate) struct RegisterToolParser;
+#[derive(Default)]
+pub(crate) struct RegisterToolParser {
+    attr_tools: FxIndexSet<Ident>,
+    lint_tools: FxIndexSet<Ident>,
+}
 
-impl CombineAttributeParser for RegisterToolParser {
-    const PATH: &[Symbol] = &[sym::register_tool];
-    type Item = Ident;
-    const CONVERT: ConvertFn<Self::Item> = |tools, _span| AttributeKind::RegisterTool(tools);
-    const ALLOWED_TARGETS: AllowedTargets<'_> = AllowedTargets::AllowList(&[Allow(Target::Crate)]);
-    const TEMPLATE: AttributeTemplate = template!(List: &["tool1, tool2, ..."]);
-    const STABILITY: AttributeStability = unstable!(register_tool);
+fn parse_register_tool(
+    tools: &mut [&mut FxIndexSet<Ident>],
+    cx: &mut AcceptContext<'_, '_>,
+    args: &ArgParser,
+) {
+    let Some(list) = cx.expect_list(args, cx.attr_span) else {
+        return;
+    };
+
+    if list.is_empty() {
+        let attr_span = cx.attr_span;
+        cx.adcx().warn_empty_attribute(attr_span);
+    }
 
-    fn extend(
-        cx: &mut AcceptContext<'_, '_>,
-        args: &ArgParser,
-    ) -> impl IntoIterator<Item = Self::Item> {
-        let Some(list) = cx.expect_list(args, cx.attr_span) else {
-            return Vec::new();
+    for elem in list.mixed() {
+        let Some(elem) = elem.meta_item() else {
+            cx.adcx().expected_identifier(elem.span());
+            continue;
+        };
+        let Some(()) = cx.expect_no_args(elem.args()) else {
+            continue;
         };
 
-        if list.is_empty() {
-            let attr_span = cx.attr_span;
-            cx.adcx().warn_empty_attribute(attr_span);
+        let path = elem.path();
+        let Some(ident) = path.word() else {
+            cx.adcx().expected_identifier(path.span());
+            continue;
+        };
+
+        if ident.name == sym::rustc {
+            cx.should_emit
+                .emit_err(cx.dcx().create_err(ToolReserved { span: ident.span, tool: ident }));
+            continue;
         }
 
-        let mut res = Vec::new();
+        for tools in tools.iter_mut() {
+            tools.insert(ident);
+        }
+    }
+}
 
-        for elem in list.mixed() {
-            let Some(elem) = elem.meta_item() else {
-                cx.adcx().expected_identifier(elem.span());
-                continue;
-            };
-            let Some(()) = cx.expect_no_args(elem.args()) else {
-                continue;
-            };
+impl AttributeParser for RegisterToolParser {
+    const ATTRIBUTES: AcceptMapping<Self> = &[
+        (
+            &[sym::register_tool],
+            template!(List: &["tool1, tool2, ..."]),
+            unstable!(register_tool),
+            |this, cx, args| {
+                parse_register_tool(&mut [&mut this.attr_tools, &mut this.lint_tools], cx, args)
+            },
+        ),
+        (
+            &[sym::register_attribute_tool],
+            template!(List: &["tool1, tool2, ..."]),
+            unstable!(register_tool),
+            |this, cx, args| parse_register_tool(&mut [&mut this.attr_tools], cx, args),
+        ),
+        (
+            &[sym::register_lint_tool],
+            template!(List: &["tool1, tool2, ..."]),
+            unstable!(register_tool),
+            |this, cx, args| parse_register_tool(&mut [&mut this.lint_tools], cx, args),
+        ),
+    ];
 
-            let path = elem.path();
-            let Some(ident) = path.word() else {
-                cx.adcx().expected_identifier(path.span());
-                continue;
-            };
+    const ALLOWED_TARGETS: AllowedTargets<'_> = AllowedTargets::AllowList(&[Allow(Target::Crate)]);
 
-            res.push(ident);
+    fn finalize(self, _cx: &FinalizeContext<'_, '_>) -> Option<AttributeKind> {
+        if self.attr_tools.is_empty() && self.lint_tools.is_empty() {
+            None
+        } else {
+            Some(AttributeKind::RegisterTool {
+                attr_tools: self.attr_tools.into_iter().collect(),
+                lint_tools: self.lint_tools.into_iter().collect(),
+            })
         }
-
-        res
     }
 }

compiler/rustc_attr_parsing/src/attributes/diagnostic/on_const.rs

@@ -5,7 +5,7 @@ use crate::attributes::diagnostic::*;
 use crate::attributes::prelude::*;
 #[derive(Default)]
 pub(crate) struct OnConstParser {
-    span: Option<Span>,
+    path_span: Option<Span>,
     directive: Option<(Span, Directive)>,
 }
 
@@ -21,8 +21,8 @@ impl AttributeParser for OnConstParser {
                 return;
             }
 
-            let span = cx.attr_span;
-            this.span = Some(span);
+            let path_span = cx.attr_path.span;
+            this.path_span = Some(path_span);
 
             let mode = Mode::DiagnosticOnConst;
 
@@ -31,7 +31,7 @@ impl AttributeParser for OnConstParser {
             let Some(directive) = parse_directive_items(cx, mode, items.mixed(), true) else {
                 return;
             };
-            merge_directives(cx, &mut this.directive, (span, directive));
+            merge_directives(cx, &mut this.directive, (path_span, directive));
         },
     )];
 
@@ -44,8 +44,11 @@ impl AttributeParser for OnConstParser {
     ]);
 
     fn finalize(self, _cx: &FinalizeContext<'_, '_>) -> Option<AttributeKind> {
-        if let Some(span) = self.span {
-            Some(AttributeKind::OnConst { span, directive: self.directive.map(|d| Box::new(d.1)) })
+        if let Some(path_span) = self.path_span {
+            Some(AttributeKind::OnConst {
+                span: path_span,
+                directive: self.directive.map(|d| Box::new(d.1)),
+            })
         } else {
             None
         }

compiler/rustc_attr_parsing/src/attributes/stability.rs

@@ -210,7 +210,7 @@ impl AttributeParser for ConstStabilityParser {
                 {
                     this.stability = Some((
                         PartialConstStability { level, feature, promotable: false },
-                        cx.attr_span,
+                        cx.attr_path.span,
                     ));
                 }
             },
@@ -225,7 +225,7 @@ impl AttributeParser for ConstStabilityParser {
                 {
                     this.stability = Some((
                         PartialConstStability { level, feature, promotable: false },
-                        cx.attr_span,
+                        cx.attr_path.span,
                     ));
                 }
             },

compiler/rustc_attr_parsing/src/context.rs

@@ -174,6 +174,7 @@ attribute_parsers!(
         OnUnknownParser,
         OnUnmatchedArgsParser,
         OpaqueParser,
+        RegisterToolParser,
         RustcAlignParser,
         RustcAlignStaticParser,
         RustcCguTestAttributeParser,
@@ -188,7 +189,6 @@ attribute_parsers!(
         Combine<FeatureParser>,
         Combine<ForceTargetFeatureParser>,
         Combine<LinkParser>,
-        Combine<RegisterToolParser>,
         Combine<ReprParser>,
         Combine<RustcAllowConstFnUnstableParser>,
         Combine<RustcCleanParser>,