about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-10-20 21:40:21 +0000
committerbors <bors@rust-lang.org>2024-10-20 21:40:21 +0000
commit7ed1a51b2587d7c4e7dd7192540e8be9eadea651 (patch)
tree497f51b1ba25c945b421db6bf96d8316c6155f88 /src/tools
parent662180b34d95f72d05b7c467b0baf4d23d36b1e1 (diff)
parent4b658657da324253a201fc7baf70d106db5df7e0 (diff)
downloadrust-7ed1a51b2587d7c4e7dd7192540e8be9eadea651.tar.gz
rust-7ed1a51b2587d7c4e7dd7192540e8be9eadea651.zip
Auto merge of #131980 - matthiaskrgr:rollup-iy5nw71, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - #131814 (`optimize` attribute applied to things other than methods/functions/c…)
 - #131927 (Check for filecheck directives in files marked `skip-filecheck`)
 - #131967 (Remove `lower_mono_bounds`)
 - #131973 (fix(rustdoc-json-types): document rustc-hash feature)
 - #131976 (feat(rustdoc-json-types): mark simple enums as copy)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/miropt-test-tools/src/lib.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/miropt-test-tools/src/lib.rs b/src/tools/miropt-test-tools/src/lib.rs
index 4317f23a822..41b53d2ad0e 100644
--- a/src/tools/miropt-test-tools/src/lib.rs
+++ b/src/tools/miropt-test-tools/src/lib.rs
@@ -129,6 +129,9 @@ pub fn files_for_miropt_test(
 
             out.push(MiroptTestFile { expected_file, from_file, to_file });
         }
+        if !run_filecheck && l.trim_start().starts_with("// CHECK") {
+            panic!("error: test contains filecheck directive but is marked `skip-filecheck`");
+        }
     }
 
     MiroptTest { run_filecheck, suffix, files: out, passes }