Rollup merge of #57107 - mjbshaw:thread_local_test, r=nikomatsakis

[rust.git] / src / test / ui / future-incompatible-lint-group.stderr

diff --git a/src/test/ui/future-incompatible-lint-group.stderr b/src/test/ui/future-incompatible-lint-group.stderr
index 56f4ff33eb2d8b2e133a8af6a3fafc30cacfdbf8..79183fca9d3a337a12e2613eaa0c13c2f69530ed 100644 (file)
--- a/src/test/ui/future-incompatible-lint-group.stderr
+++ b/src/test/ui/future-incompatible-lint-group.stderr
@@ -1,16 +1,16 @@
 error: anonymous parameters are deprecated and will be removed in the next edition.
-  --> $DIR/future-incompatible-lint-group.rs:14:10
+  --> $DIR/future-incompatible-lint-group.rs:4:10
    |
 LL |     fn f(u8) {} //~ ERROR anonymous parameters are deprecated
    |          ^^ help: Try naming the parameter or explicitly ignoring it: `_: u8`
    |
 note: lint level defined here
-  --> $DIR/future-incompatible-lint-group.rs:11:9
+  --> $DIR/future-incompatible-lint-group.rs:1:9
    |
 LL | #![deny(future_incompatible)]
    |         ^^^^^^^^^^^^^^^^^^^
    = note: #[deny(anonymous_parameters)] implied by #[deny(future_incompatible)]
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #41686 <https://github.com/rust-lang/rust/issues/41686>
 
 error: aborting due to previous error