about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-01-08 13:43:42 -0800
committerAlex Crichton <alex@alexcrichton.com>2018-01-13 16:07:13 -0800
commit0ecaa67e9082b609bd8fd315b6cc41be7e8ee139 (patch)
tree52ec33dd42e044de23a02791ced2315bc1cf56bf /src/test
parent5f006cebfc5939195f6df6d1f50f02f079233928 (diff)
rustc: Refactor attribute checking to operate on HIR
This'll enable running queries that could be cached and overall be more amenable
to the query infastructure.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr4
-rw-r--r--src/test/ui/target-feature-wrong.rs2
-rw-r--r--src/test/ui/target-feature-wrong.stderr20
3 files changed, 14 insertions, 12 deletions
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr
index 92bda4d0446..444c4176994 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr
@@ -1,3 +1,5 @@
+error[E0601]: main function not found
+
 error[E0518]: attribute should be applied to function
   --> $DIR/issue-43106-gating-of-inline.rs:21:1
    |
@@ -37,7 +39,5 @@ error[E0518]: attribute should be applied to function
 35 |     #[inline = "2100"] impl S { }
    |     ^^^^^^^^^^^^^^^^^^ ---------- not a function
 
-error[E0601]: main function not found
-
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/target-feature-wrong.rs b/src/test/ui/target-feature-wrong.rs
index df24035e10b..e70d549ed57 100644
--- a/src/test/ui/target-feature-wrong.rs
+++ b/src/test/ui/target-feature-wrong.rs
@@ -10,6 +10,8 @@
 
 // ignore-arm
 // ignore-aarch64
+// ignore-wasm
+// ignore-emscripten
 
 #![feature(target_feature)]
 
diff --git a/src/test/ui/target-feature-wrong.stderr b/src/test/ui/target-feature-wrong.stderr
index 0cbfeb3a7b7..c5534bf147d 100644
--- a/src/test/ui/target-feature-wrong.stderr
+++ b/src/test/ui/target-feature-wrong.stderr
@@ -1,31 +1,31 @@
 warning: #[target_feature = ".."] is deprecated and will eventually be removed, use #[target_feature(enable = "..")] instead
-  --> $DIR/target-feature-wrong.rs:16:1
+  --> $DIR/target-feature-wrong.rs:18:1
    |
-16 | #[target_feature = "+sse2"]
+18 | #[target_feature = "+sse2"]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: the feature named `foo` is not valid for this target
-  --> $DIR/target-feature-wrong.rs:18:18
+  --> $DIR/target-feature-wrong.rs:20:18
    |
-18 | #[target_feature(enable = "foo")]
+20 | #[target_feature(enable = "foo")]
    |                  ^^^^^^^^^^^^^^
 
 error: #[target_feature(..)] only accepts sub-keys of `enable` currently
-  --> $DIR/target-feature-wrong.rs:20:18
+  --> $DIR/target-feature-wrong.rs:22:18
    |
-20 | #[target_feature(bar)]
+22 | #[target_feature(bar)]
    |                  ^^^
 
 error: #[target_feature(..)] only accepts sub-keys of `enable` currently
-  --> $DIR/target-feature-wrong.rs:22:18
+  --> $DIR/target-feature-wrong.rs:24:18
    |
-22 | #[target_feature(disable = "baz")]
+24 | #[target_feature(disable = "baz")]
    |                  ^^^^^^^^^^^^^^^
 
 error: #[target_feature(..)] can only be applied to `unsafe` function
-  --> $DIR/target-feature-wrong.rs:26:1
+  --> $DIR/target-feature-wrong.rs:28:1
    |
-26 | #[target_feature(enable = "sse2")]
+28 | #[target_feature(enable = "sse2")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 4 previous errors