diff options
| author | bors <bors@rust-lang.org> | 2019-12-08 06:02:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-08 06:02:54 +0000 |
| commit | e862c01aadb2d029864f7bb256cf6c85bbb5d7e4 (patch) | |
| tree | d1c98f5b876a0d8f092f7003cab372b5dbe00f16 /src/libcore | |
| parent | de17464b14e503edca6625daa9cd4c338ffafee2 (diff) | |
| parent | 32e27c2c9a11e47289ac36101f583e08e8bc6f5e (diff) | |
| download | rust-e862c01aadb2d029864f7bb256cf6c85bbb5d7e4.tar.gz rust-e862c01aadb2d029864f7bb256cf6c85bbb5d7e4.zip | |
Auto merge of #67140 - Centril:rollup-h7rbw7y, r=Centril
Rollup of 5 pull requests Successful merges: - #66325 (Change unused_labels from allow to warn) - #66991 (Cleanup BodyCache) - #67101 (use `#[allow(unused_attributes)]` to paper over incr.comp problem) - #67114 (Make `ForeignItem` an alias of `Item`.) - #67129 (Fixes typo) Failed merges: - #66886 (Remove the borrow check::nll submodule) r? @ghost
Diffstat (limited to 'src/libcore')
| -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 { |