Auto merge of #158015 - JonathanBrouwer:rollup-4hzy2nc, r=JonathanBrouwer

Rollup of 3 pull requests

Successful merges:

 - #157931 (Improve `declare_features!` macro error)
 - #157992 (tidy: revisions inherit global directives)
 - #158010 (renovate: Pin GitHub Action digests to SemVer)

Author: bors

.github/renovate.json5

@@ -1,8 +1,9 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    // Pin GitHub Actions to their commit SHA digests
-    "helpers:pinGitHubActionDigests"
+    // Pin GitHub Actions to their commit SHA digests, resolving floating tags
+    // (e.g. `v4`) to the full SemVer version (e.g. `v4.1.2`)
+    "helpers:pinGitHubActionDigestsToSemver"
   ],
   // Let Renovatebot keep an opened issue that tracks our dependencies
   "dependencyDashboard": true,

compiler/rustc_feature/src/unstable.rs

@@ -173,7 +173,8 @@ macro_rules! declare_features {
             pub fn incomplete(&self, feature: Symbol) -> bool {
                 match feature {
                     $(
-                        sym::$feature => status_to_enum!($status) == FeatureStatus::Incomplete,
+                        // Match guard to avoid duplicating `cannot find $feature in module sym` error.
+                        f if f == sym::$feature => status_to_enum!($status) == FeatureStatus::Incomplete,
                     )*
                     _ if self.enabled_features.contains(&feature) => {
                         // Accepted/removed features and library features aren't in this file but
@@ -189,7 +190,8 @@ macro_rules! declare_features {
             pub fn internal(&self, feature: Symbol) -> bool {
                 match feature {
                     $(
-                        sym::$feature => status_to_enum!($status) == FeatureStatus::Internal,
+                       // Match guard to avoid duplicating `cannot find $feature in module sym` error.
+                       f if f == sym::$feature => status_to_enum!($status) == FeatureStatus::Internal,
                     )*
                     _ if self.enabled_features.contains(&feature) => {
                         // This could be accepted/removed, or a libs feature.

src/tools/tidy/src/target_specific_tests.rs

@@ -13,7 +13,9 @@ const COMPILE_FLAGS_HEADER: &str = "compile-flags:";
 
 #[derive(Default, Debug)]
 struct RevisionInfo<'a> {
+    /// Target architecture specified with `--target=`
     target_arch: Option<Option<&'a str>>,
+    /// LLVM components configured with `//@ needs-llvm-components: ...`
     llvm_components: Option<Vec<&'a str>>,
 }
 
@@ -61,6 +63,22 @@ pub fn check(tests_path: &Path, tidy_ctx: TidyCtx) {
             return;
         }
 
+        // Directives without an explicit revision. These are inherited by all revisions.
+        let global = header_map.remove(&None).unwrap_or_default();
+
+        if header_map.is_empty() {
+            // `//@ revisions` is not used.
+            header_map.insert(None, global);
+        } else {
+            // Make all revisions inherit global directives.
+            for info in header_map.values_mut() {
+                info.target_arch = info.target_arch.or(global.target_arch);
+                if let Some(components) = &global.llvm_components {
+                    info.llvm_components.get_or_insert_with(Vec::new).extend(components);
+                }
+            }
+        }
+
         for (rev, RevisionInfo { target_arch, llvm_components }) in &header_map {
             let rev = rev.unwrap_or("[unspecified]");
             match (target_arch, llvm_components) {

tests/assembly-llvm/c-variadic/mips.rs

@@ -2,12 +2,10 @@
 //@ assembly-output: emit-asm
 //
 //@ revisions: MIPS MIPS64 MIPS64EL
+//@ needs-llvm-components: mips
 //@ [MIPS] compile-flags: -Copt-level=3 --target mips-unknown-linux-gnu
-//@ [MIPS] needs-llvm-components: mips
 //@ [MIPS64] compile-flags: -Copt-level=3 --target mipsisa64r6-unknown-linux-gnuabi64
-//@ [MIPS64] needs-llvm-components: mips
 //@ [MIPS64EL] compile-flags: -Copt-level=3 --target mips64el-unknown-linux-gnuabi64
-//@ [MIPS64EL] needs-llvm-components: mips
 #![feature(c_variadic, no_core, lang_items, intrinsics, rustc_attrs, asm_experimental_arch)]
 #![no_core]
 #![crate_type = "lib"]