Skip to content

Commit 95d7899

Browse files
committed
Auto merge of #142997 - workingjubilee:rollup-6lxec87, r=workingjubilee
Rollup of 15 pull requests Successful merges: - rust-lang/rust#135731 (Implement parsing of pinned borrows) - rust-lang/rust#138780 (Add `#[loop_match]` for improved DFA codegen) - rust-lang/rust#142453 (Windows: make `read_dir` stop iterating after the first error is encountered) - rust-lang/rust#142633 (Error on invalid signatures for interrupt ABIs) - rust-lang/rust#142768 (Avoid a bitcast FFI call in transmuting) - rust-lang/rust#142825 (Port `#[track_caller]` to the new attribute system) - rust-lang/rust#142844 (Enable short-ice for Windows) - rust-lang/rust#142934 (Tweak `-Zmacro-stats` measurement.) - rust-lang/rust#142955 (Couple of test suite fixes for cg_clif) - rust-lang/rust#142977 (rustdoc: Don't mark `#[target_feature]` functions as ⚠) - rust-lang/rust#142980 (Reduce mismatched-lifetime-syntaxes suggestions to MaybeIncorrect) - rust-lang/rust#142982 (Corrected spelling mistake in c_str.rs) - rust-lang/rust#142983 (Taint body on invalid call ABI) - rust-lang/rust#142988 (Update wasm-component-ld to 0.5.14) - rust-lang/rust#142993 (Update cargo) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f7b5bc1 + 18e4cce commit 95d7899

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

scripts/test_rustc_tests.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,6 @@ rm tests/ui/process/process-panic-after-fork.rs # same
151151
cp ../dist/bin/rustdoc-clif ../dist/bin/rustdoc # some tests expect bin/rustdoc to exist
152152

153153
cat <<EOF | git apply -
154-
diff --git a/tests/run-make/linker-warning/rmake.rs b/tests/run-make/linker-warning/rmake.rs
155-
index 30387af428c..f7895b12961 100644
156-
--- a/tests/run-make/linker-warning/rmake.rs
157-
+++ b/tests/run-make/linker-warning/rmake.rs
158-
@@ -57,7 +57,8 @@ fn main() {
159-
.actual_text("(linker error)", out.stderr())
160-
- .normalize(r#"/rustc[^/]*/"#, "/rustc/")
161-
+ .normalize(r#"/tmp/rustc[^/]*/"#, "/tmp/rustc/")
162-
+ .normalize("libpanic_abort", "libpanic_unwind")
163-
.normalize(
164-
regex::escape(run_make_support::build_root().to_str().unwrap()),
165-
"/build-root",
166-
)
167-
.normalize(r#""[^"]*\/symbols.o""#, "\\"/symbols.o\\"")
168154
diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs
169155
index 073116933bd..c3e4578204d 100644
170156
--- a/src/tools/compiletest/src/runtest/run_make.rs

0 commit comments

Comments
 (0)