Skip to content

Commit

Permalink
Rollup merge of rust-lang#52899 - draganmladjenovic:ui_tests64, r=ale…
Browse files Browse the repository at this point in the history
…xcrichton

tests/ui: Add missing mips{64} ignores
  • Loading branch information
pietroalbini authored Aug 1, 2018
2 parents e3928cc + f985e6c commit 3ae03e9
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/test/ui/asm-out-assign-imm.nll.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0384]: cannot assign twice to immutable variable `x`
--> $DIR/asm-out-assign-imm.rs:33:9
--> $DIR/asm-out-assign-imm.rs:34:9
|
LL | let x: isize;
| - consider changing this to `mut x`
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/asm-out-assign-imm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// ignore-sparc
// ignore-sparc64
// ignore-mips
// ignore-mips64

#![feature(asm)]

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/asm-out-assign-imm.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0384]: cannot assign twice to immutable variable `x`
--> $DIR/asm-out-assign-imm.rs:33:9
--> $DIR/asm-out-assign-imm.rs:34:9
|
LL | x = 1;
| ----- first assignment to `x`
Expand Down
2 changes: 2 additions & 0 deletions src/test/ui/target-feature-gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// ignore-aarch64
// ignore-wasm
// ignore-emscripten
// ignore-mips
// ignore-mips64
// gate-test-sse4a_target_feature
// gate-test-powerpc_target_feature
// gate-test-avx512_target_feature
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/target-feature-gate.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0658]: the target feature `avx512bw` is currently unstable (see issue #44839)
--> $DIR/target-feature-gate.rs:26:18
--> $DIR/target-feature-gate.rs:28:18
|
LL | #[target_feature(enable = "avx512bw")]
| ^^^^^^^^^^^^^^^^^^^
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/target-feature-wrong.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// ignore-wasm
// ignore-emscripten
// ignore-mips
// ignore-mips64
// ignore-powerpc
// ignore-powerpc64
// ignore-powerpc64le
Expand Down
14 changes: 7 additions & 7 deletions src/test/ui/target-feature-wrong.stderr
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
error: #[target_feature] attribute must be of the form #[target_feature(..)]
--> $DIR/target-feature-wrong.rs:25:1
--> $DIR/target-feature-wrong.rs:26:1
|
LL | #[target_feature = "+sse2"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: the feature named `foo` is not valid for this target
--> $DIR/target-feature-wrong.rs:27:18
--> $DIR/target-feature-wrong.rs:28:18
|
LL | #[target_feature(enable = "foo")]
| ^^^^^^^^^^^^^^

error: #[target_feature(..)] only accepts sub-keys of `enable` currently
--> $DIR/target-feature-wrong.rs:29:18
--> $DIR/target-feature-wrong.rs:30:18
|
LL | #[target_feature(bar)]
| ^^^

error: #[target_feature(..)] only accepts sub-keys of `enable` currently
--> $DIR/target-feature-wrong.rs:31:18
--> $DIR/target-feature-wrong.rs:32:18
|
LL | #[target_feature(disable = "baz")]
| ^^^^^^^^^^^^^^^

error: #[target_feature(..)] can only be applied to `unsafe` function
--> $DIR/target-feature-wrong.rs:35:1
--> $DIR/target-feature-wrong.rs:36:1
|
LL | #[target_feature(enable = "sse2")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: attribute should be applied to a function
--> $DIR/target-feature-wrong.rs:39:1
--> $DIR/target-feature-wrong.rs:40:1
|
LL | #[target_feature(enable = "sse2")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -38,7 +38,7 @@ LL | mod another {}
| -------------- not a function

error: cannot use #[inline(always)] with #[target_feature]
--> $DIR/target-feature-wrong.rs:43:1
--> $DIR/target-feature-wrong.rs:44:1
|
LL | #[inline(always)]
| ^^^^^^^^^^^^^^^^^
Expand Down

0 comments on commit 3ae03e9

Please sign in to comment.