about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-03-03 19:27:49 +0800
committerkennytm <kennytm@gmail.com>2018-03-24 07:00:48 +0800
commit28b2bba58502d87a9a7d62649dccc946c1fc7e45 (patch)
treeabb1c57361050866c23e6da2d268295bab3b0d1d /src/test
parent023274483e5b61202c623352452cf17fcf455a6d (diff)
downloadrust-28b2bba58502d87a9a7d62649dccc946c1fc7e45.tar.gz
rust-28b2bba58502d87a9a7d62649dccc946c1fc7e45.zip
Specialize future-incompatibility warning for UNSTABLE_NAME_COLLISION.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/inference_unstable.rs4
-rw-r--r--src/test/ui/inference_unstable.stderr4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/ui/inference_unstable.rs b/src/test/ui/inference_unstable.rs
index 525fda33955..816c443a06c 100644
--- a/src/test/ui/inference_unstable.rs
+++ b/src/test/ui/inference_unstable.rs
@@ -24,6 +24,6 @@ use inference_unstable_itertools::IpuItertools;
 
 fn main() {
     assert_eq!('x'.ipu_flatten(), 1);
-    //~^ WARN a method with this name will be added to the standard library in the future
-    //~^^ WARN it will become a hard error in a future release
+    //~^ WARN a method with this name may be added to the standard library in the future
+    //~^^ WARN once this method is added to the standard library, there will be ambiguity here
 }
diff --git a/src/test/ui/inference_unstable.stderr b/src/test/ui/inference_unstable.stderr
index a5cf4d6dff3..21b1bdbf179 100644
--- a/src/test/ui/inference_unstable.stderr
+++ b/src/test/ui/inference_unstable.stderr
@@ -1,11 +1,11 @@
-warning: a method with this name will be added to the standard library in the future
+warning: a method with this name may be added to the standard library in the future
   --> $DIR/inference_unstable.rs:26:20
    |
 LL |     assert_eq!('x'.ipu_flatten(), 1);
    |                    ^^^^^^^^^^^
    |
    = note: #[warn(unstable_name_collision)] on by default
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = warning: once this method is added to the standard library, there will be ambiguity here, which will cause a hard error!
    = note: for more information, see pr #48552 <https://github.com/rust-lang/rust/pull/48552>
    = help: call with fully qualified syntax `inference_unstable_itertools::IpuItertools::ipu_flatten(...)` to keep using the current method
    = note: add #![feature(ipu_flatten)] to the crate attributes to enable `inference_unstable_iterator::IpuIterator::ipu_flatten`