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/0012-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/0012-test-failed-doctest-output-Fix-normalization.patch')
| -rw-r--r-- | user/rust/0012-test-failed-doctest-output-Fix-normalization.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/user/rust/0012-test-failed-doctest-output-Fix-normalization.patch b/user/rust/0012-test-failed-doctest-output-Fix-normalization.patch deleted file mode 100644 index 37723d14b..000000000 --- a/user/rust/0012-test-failed-doctest-output-Fix-normalization.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 288b1c1845096034f370b78f0c2ff3e31c468581 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Mon, 7 Oct 2019 18:36:28 -0500 -Subject: [PATCH 12/18] 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 d2cdeb8f8f5..0e3f765fda6 100644 ---- a/src/test/rustdoc-ui/failed-doctest-output.rs -+++ b/src/test/rustdoc-ui/failed-doctest-output.rs -@@ -3,7 +3,7 @@ - // adapted to use that, and that normalize line can go away - - // compile-flags:--test --// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR" -+// normalize-stdout-test: "[[:graph:]]*src/test/rustdoc-ui" -> "$$DIR" - // failure-status: 101 - - // doctest fails at runtime --- -2.21.0 - |