mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #67101 - rust-lang:ostrich, r=Mark-Simulacrum

Browse Source 
use `#[allow(unused_attributes)]` to paper over incr.comp problem

Paper over the problem in #58633.

r? @Mark-Simulacrum
This commit is contained in:
Mazdak Farrokhzad 2019-12-08 03:39:47 +01:00 committed by GitHub
commit b8e921b8c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libcore/convert/mod.rs
View File

@ -567,6 +567,7 @@ fn from(t: T) -> T {
///
/// [#64715]: https://github.com/rust-lang/rust/issues/64715
#[stable(feature = "convert_infallible", since = "1.34.0")]
#[allow(unused_attributes)] // FIXME(#58633): do a principled fix instead.
#[rustc_reservation_impl = "permitting this impl would forbid us from adding \
`impl<T> From<!> for T` later; see rust-lang/rust#64715 for details"]
impl<T> From<!> for T {