diff options
| author | Samuel Holland <samuel@sholland.org> | 2022-04-30 04:27:44 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:34:01 -0500 |
| commit | 36ba9dd47f31bfbe4811b03df9a2871c43857219 (patch) | |
| tree | 2637bf028a2ab8f6e4598f11b1afb84824fdcb64 /user/rust/0008-test-failed-doctest-output-Fix-normalization.patch | |
| parent | 04e62b2391dc7f829349c87e1cc71597731e3c88 (diff) | |
| download | packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.gz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.bz2 packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.xz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.zip | |
user/rust: Bump to 1.60.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0008-test-failed-doctest-output-Fix-normalization.patch')
| -rw-r--r-- | user/rust/0008-test-failed-doctest-output-Fix-normalization.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/user/rust/0008-test-failed-doctest-output-Fix-normalization.patch b/user/rust/0008-test-failed-doctest-output-Fix-normalization.patch new file mode 100644 index 000000000..f8c537afe --- /dev/null +++ b/user/rust/0008-test-failed-doctest-output-Fix-normalization.patch @@ -0,0 +1,36 @@ +From 26ba9c852ad73dcc0401b74534b34bf33d5b6444 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 7 Oct 2019 18:36:28 -0500 +Subject: [PATCH 08/14] test/failed-doctest-output: Fix normalization + +Otherwise we get: + +1 +2 running 2 tests +- test $DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED +- test $DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED ++ test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED ++ test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED +5 +6 failures: +7 +--- + src/test/rustdoc-ui/failed-doctest-output.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/test/rustdoc-ui/failed-doctest-output.rs b/src/test/rustdoc-ui/failed-doctest-output.rs +index 92473b49e14..ed29b446aba 100644 +--- a/src/test/rustdoc-ui/failed-doctest-output.rs ++++ b/src/test/rustdoc-ui/failed-doctest-output.rs +@@ -4,7 +4,7 @@ + + // compile-flags:--test --test-args --test-threads=1 + // rustc-env:RUST_BACKTRACE=0 +-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR" ++// normalize-stdout-test: "[[:graph:]]*src/test/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" + // failure-status: 101 + +-- +2.35.1 + |