diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-08 03:39:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-08 03:39:47 +0100 |
| commit | b8e921b8c8f2a03dc36843f7f31e04be8ee82f29 (patch) | |
| tree | 959428c07d7b4583262dbd52ba1f792d444781f5 | |
| parent | 56c0bea3906e6741e558f7129713bd899f894da2 (diff) | |
| parent | baeed9266d316eb937ab6180ff8ba500c52fbaa0 (diff) | |
| download | rust-b8e921b8c8f2a03dc36843f7f31e04be8ee82f29.tar.gz rust-b8e921b8c8f2a03dc36843f7f31e04be8ee82f29.zip | |
Rollup merge of #67101 - rust-lang:ostrich, r=Mark-Simulacrum
use `#[allow(unused_attributes)]` to paper over incr.comp problem Paper over the problem in #58633. r? @Mark-Simulacrum
| -rw-r--r-- | src/libcore/convert/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcore/convert/mod.rs b/src/libcore/convert/mod.rs index 16d5375059f..5414d9ac234 100644 --- a/src/libcore/convert/mod.rs +++ b/src/libcore/convert/mod.rs @@ -567,6 +567,7 @@ impl<T> From<T> for 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 { |