From 167ab0439eb9f2d7b199f846fe07061b31185e09 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Mon, 23 Sep 2019 14:27:34 -0400 Subject: [PATCH] nit: update error text to cite tracking issue --- src/libcore/convert.rs | 8 ++------ src/test/ui/never-from-impl-is-reserved.stderr | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs index 6edd56f7492..71edea561b8 100644 --- a/src/libcore/convert.rs +++ b/src/libcore/convert.rs @@ -556,12 +556,8 @@ fn from(t: T) -> T { t } #[stable(feature = "convert_infallible", since = "1.34.0")] #[cfg(not(boostrap_stdarch_ignore_this))] -#[rustc_reservation_impl="a future version of Rust might implement `From` for \ - all types. \ - However, it is OK to implement `From` for types you own - \ - when the blanket impl will be added, coherence will be changed \ - to make these impls not be an error." -] +#[rustc_reservation_impl="permitting this impl would forbid us from adding \ +`impl From for T` later; see rust-lang/rust#64715 for details"] impl From for T { fn from(t: !) -> T { t } } diff --git a/src/test/ui/never-from-impl-is-reserved.stderr b/src/test/ui/never-from-impl-is-reserved.stderr index 352fed7ca45..8b8d0f4ea73 100644 --- a/src/test/ui/never-from-impl-is-reserved.stderr +++ b/src/test/ui/never-from-impl-is-reserved.stderr @@ -7,7 +7,7 @@ LL | // This will conflict with the first impl if we impl `for T: From`. LL | impl MyTrait for T where T: From {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `MyFoo` | - = note: a future version of Rust might implement `From` for all types. However, it is OK to implement `From` for types you own - when the blanket impl will be added, coherence will be changed to make these impls not be an error. + = note: permitting this impl would forbid us from adding `impl From for T` later; see rust-lang/rust#64715 for details error: aborting due to previous error -- 2.44.0