about summary refs log tree commit diff
path: root/src/test/ui/conditional-compilation
diff options
context:
space:
mode:
authordylan_DPC <dylan.dpc@gmail.com>2019-01-04 17:21:29 +0530
committerdylan_DPC <dylan.dpc@gmail.com>2019-01-08 00:21:07 +0530
commit64a17a0e599ec32252b96f7b5fa3d208ec7d77ef (patch)
tree1afded876ad81b1d603a550f51c73e95870aa157 /src/test/ui/conditional-compilation
parent1ef99f1353b5cb2e2a4c4fe316d9869c4834888b (diff)
downloadrust-64a17a0e599ec32252b96f7b5fa3d208ec7d77ef.tar.gz
rust-64a17a0e599ec32252b96f7b5fa3d208ec7d77ef.zip
remove unused imports and feature gate from tests
Diffstat (limited to 'src/test/ui/conditional-compilation')
-rw-r--r--src/test/ui/conditional-compilation/cfg-attr-multi-false.rs1
-rw-r--r--src/test/ui/conditional-compilation/cfg-attr-multi-true.rs1
-rw-r--r--src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr10
3 files changed, 5 insertions, 7 deletions
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-false.rs b/src/test/ui/conditional-compilation/cfg-attr-multi-false.rs
index 283a4b36812..f1ab2f0f946 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-false.rs
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-false.rs
@@ -4,7 +4,6 @@
 // compile-pass
 
 #![warn(unused_must_use)]
-#![cfg_attr(stage0, feature(cfg_attr_multi))]
 
 #[cfg_attr(any(), deprecated, must_use)]
 struct Struct {}
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-true.rs b/src/test/ui/conditional-compilation/cfg-attr-multi-true.rs
index d2fd3ec2bec..86524e8bd28 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-true.rs
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-true.rs
@@ -5,7 +5,6 @@
 // compile-pass
 
 #![warn(unused_must_use)]
-#![cfg_attr(stage0, feature(cfg_attr_multi))]
 
 #[cfg_attr(all(), deprecated, must_use)]
 struct MustUseDeprecated {}
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr b/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
index 8b62587c6f8..3d14c197397 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
@@ -1,5 +1,5 @@
 warning: use of deprecated item 'MustUseDeprecated'
-  --> $DIR/cfg-attr-multi-true.rs:13:6
+  --> $DIR/cfg-attr-multi-true.rs:12:6
    |
 LL | impl MustUseDeprecated { //~ warning: use of deprecated item
    |      ^^^^^^^^^^^^^^^^^
@@ -7,25 +7,25 @@ LL | impl MustUseDeprecated { //~ warning: use of deprecated item
    = note: #[warn(deprecated)] on by default
 
 warning: use of deprecated item 'MustUseDeprecated'
-  --> $DIR/cfg-attr-multi-true.rs:20:5
+  --> $DIR/cfg-attr-multi-true.rs:19:5
    |
 LL |     MustUseDeprecated::new(); //~ warning: use of deprecated item
    |     ^^^^^^^^^^^^^^^^^^^^^^
 
 warning: use of deprecated item 'MustUseDeprecated'
-  --> $DIR/cfg-attr-multi-true.rs:14:17
+  --> $DIR/cfg-attr-multi-true.rs:13:17
    |
 LL |     fn new() -> MustUseDeprecated { //~ warning: use of deprecated item
    |                 ^^^^^^^^^^^^^^^^^
 
 warning: use of deprecated item 'MustUseDeprecated'
-  --> $DIR/cfg-attr-multi-true.rs:15:9
+  --> $DIR/cfg-attr-multi-true.rs:14:9
    |
 LL |         MustUseDeprecated {} //~ warning: use of deprecated item
    |         ^^^^^^^^^^^^^^^^^
 
 warning: unused `MustUseDeprecated` that must be used
-  --> $DIR/cfg-attr-multi-true.rs:20:5
+  --> $DIR/cfg-attr-multi-true.rs:19:5
    |
 LL |     MustUseDeprecated::new(); //~ warning: use of deprecated item
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^