diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-06 20:22:35 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-04-06 20:22:35 +0000 |
| commit | 7b77e0c080a78c2525e286e41b3721393f79fa8f (patch) | |
| tree | 2580c195af5f6405fc74b0415211da14a416c39b /user/rust/0017-test-target-feature-gate-Only-run-on-relevant-target.patch | |
| parent | 8c2a854351b6ea35aed27d44baff826f400a0497 (diff) | |
| parent | fd100f124927cd65cf821bd5d538815e81034c1b (diff) | |
| download | packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.gz packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.bz2 packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.xz packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.33.0
See merge request !205
Diffstat (limited to 'user/rust/0017-test-target-feature-gate-Only-run-on-relevant-target.patch')
| -rw-r--r-- | user/rust/0017-test-target-feature-gate-Only-run-on-relevant-target.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/user/rust/0017-test-target-feature-gate-Only-run-on-relevant-target.patch b/user/rust/0017-test-target-feature-gate-Only-run-on-relevant-target.patch deleted file mode 100644 index 5e8c71668..000000000 --- a/user/rust/0017-test-target-feature-gate-Only-run-on-relevant-target.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bc1a70133b259188ec4595eef8d11670cc8d64f5 Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Sun, 16 Sep 2018 16:39:46 +0000 -Subject: [PATCH 17/23] test/target-feature-gate: Only run on relevant targets - ---- - src/test/ui/target-feature-gate.rs | 2 ++ - src/test/ui/target-feature-gate.stderr | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/test/ui/target-feature-gate.rs b/src/test/ui/target-feature-gate.rs -index 8a045884ca..5e90417fc3 100644 ---- a/src/test/ui/target-feature-gate.rs -+++ b/src/test/ui/target-feature-gate.rs -@@ -10,6 +10,8 @@ - - // ignore-arm - // ignore-aarch64 -+// ignore-powerpc -+// ignore-powerpc64 - // ignore-wasm - // ignore-emscripten - // ignore-mips -diff --git a/src/test/ui/target-feature-gate.stderr b/src/test/ui/target-feature-gate.stderr -index f18bebc0c2..5458953601 100644 ---- a/src/test/ui/target-feature-gate.stderr -+++ b/src/test/ui/target-feature-gate.stderr -@@ -1,5 +1,5 @@ - error[E0658]: the target feature `avx512bw` is currently unstable (see issue #44839) -- --> $DIR/target-feature-gate.rs:29:18 -+ --> $DIR/target-feature-gate.rs:31:18 - | - LL | #[target_feature(enable = "avx512bw")] - | ^^^^^^^^^^^^^^^^^^^ --- -2.19.2 - |