Skip to content

Commit 167ab04

Browse files
nikomatsakisarielb1
authored andcommitted
nit: update error text to cite tracking issue
1 parent da60c53 commit 167ab04

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

src/libcore/convert.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -556,12 +556,8 @@ impl<T> From<T> for T {
556556

557557
#[stable(feature = "convert_infallible", since = "1.34.0")]
558558
#[cfg(not(boostrap_stdarch_ignore_this))]
559-
#[rustc_reservation_impl="a future version of Rust might implement `From<!>` for \
560-
all types. \
561-
However, it is OK to implement `From<!>` for types you own - \
562-
when the blanket impl will be added, coherence will be changed \
563-
to make these impls not be an error."
564-
]
559+
#[rustc_reservation_impl="permitting this impl would forbid us from adding \
560+
`impl<T> From<!> for T` later; see rust-lang/rust#64715 for details"]
565561
impl<T> From<!> for T {
566562
fn from(t: !) -> T { t }
567563
}

src/test/ui/never-from-impl-is-reserved.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | // This will conflict with the first impl if we impl `for<T> T: From<!>`.
77
LL | impl<T> MyTrait for T where T: From<!> {}
88
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `MyFoo`
99
|
10-
= 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.
10+
= note: permitting this impl would forbid us from adding `impl<T> From<!> for T` later; see rust-lang/rust#64715 for details
1111

1212
error: aborting due to previous error
1313

0 commit comments

Comments
 (0)