Rollup merge of #126823 - GuillaumeGomez:migrate-run-make-inline-alwa… · rust-lang/rust@d265538 (original) (raw)

File tree

4 files changed

lines changed

4 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -387,7 +387,7 @@ pub fn recursive_diff(dir1: impl AsRef, dir2: impl AsRef) {
387 387 });
388 388 }
389 389
390 -pub fn read_dir<F: Fn(&Path)>(dir: impl AsRef<Path>, callback: F) {
390 +pub fn read_dir<F: FnMut(&Path)>(dir: impl AsRef<Path>, mut callback: F) {
391 391 for entry in fs_wrapper::read_dir(dir) {
392 392 callback(&entry.unwrap().path());
393 393 }
Original file line number Diff line number Diff line change
@@ -52,7 +52,6 @@ run-make/foreign-rust-exceptions/Makefile
52 52 run-make/include_bytes_deps/Makefile
53 53 run-make/incr-add-rust-src-component/Makefile
54 54 run-make/incr-foreign-head-span/Makefile
55 -run-make/inline-always-many-cgu/Makefile
56 55 run-make/interdependent-c-libraries/Makefile
57 56 run-make/intrinsic-unreachable/Makefile
58 57 run-make/invalid-library/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
1 +use run_make_support::fs_wrapper::read_to_string;
2 +use run_make_support::regex::Regex;
3 +use run_make_support::{read_dir, rustc};
4 +
5 +use std::ffi::OsStr;
6 +
7 +fn main() {
8 +rustc().input("foo.rs").emit("llvm-ir").codegen_units(2).run();
9 +let re = Regex::new(r"\bcall\b").unwrap();
10 +let mut nb_ll = 0;
11 +read_dir(".", |path
12 +if path.is_file() && path.extension().is_some_and(|ext
13 +assert!(!re.is_match(&read_to_string(path)));
14 + nb_ll += 1;
15 +}
16 +});
17 +assert!(nb_ll > 0);
18 +}