about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/feature-gate/duplicate-features.rs5
-rw-r--r--src/test/ui/feature-gate/duplicate-features.stderr19
2 files changed, 9 insertions, 15 deletions
diff --git a/src/test/ui/feature-gate/duplicate-features.rs b/src/test/ui/feature-gate/duplicate-features.rs
index 90d2a6cebcc..163a28772a5 100644
--- a/src/test/ui/feature-gate/duplicate-features.rs
+++ b/src/test/ui/feature-gate/duplicate-features.rs
@@ -9,12 +9,11 @@
 // except according to those terms.
 
 #![allow(stable_features)]
-#![deny(duplicate_features)]
 
 #![feature(rust1)]
-#![feature(rust1)] //~ ERROR duplicate `rust1` feature attribute
+#![feature(rust1)] //~ ERROR the feature `rust1` has already been declared
 
 #![feature(if_let)]
-#![feature(if_let)] //~ ERROR duplicate `if_let` feature attribute
+#![feature(if_let)] //~ ERROR the feature `if_let` has already been declared
 
 fn main() {}
diff --git a/src/test/ui/feature-gate/duplicate-features.stderr b/src/test/ui/feature-gate/duplicate-features.stderr
index bf8e9157db0..d55297bdd0e 100644
--- a/src/test/ui/feature-gate/duplicate-features.stderr
+++ b/src/test/ui/feature-gate/duplicate-features.stderr
@@ -1,20 +1,15 @@
-error: duplicate `if_let` feature attribute
-  --> $DIR/duplicate-features.rs:18:12
+error[E0636]: the feature `if_let` has already been declared
+  --> $DIR/duplicate-features.rs:17:12
    |
-LL | #![feature(if_let)] //~ ERROR duplicate `if_let` feature attribute
+LL | #![feature(if_let)] //~ ERROR the feature `if_let` has already been declared
    |            ^^^^^^
-   |
-note: lint level defined here
-  --> $DIR/duplicate-features.rs:12:9
-   |
-LL | #![deny(duplicate_features)]
-   |         ^^^^^^^^^^^^^^^^^^
 
-error: duplicate `rust1` feature attribute
-  --> $DIR/duplicate-features.rs:15:12
+error[E0636]: the feature `rust1` has already been declared
+  --> $DIR/duplicate-features.rs:14:12
    |
-LL | #![feature(rust1)] //~ ERROR duplicate `rust1` feature attribute
+LL | #![feature(rust1)] //~ ERROR the feature `rust1` has already been declared
    |            ^^^^^
 
 error: aborting due to 2 previous errors
 
+For more information about this error, try `rustc --explain E0636`.