Skip to content

Commit

Permalink
Rollup merge of rust-lang#67101 - rust-lang:ostrich, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
use `#[allow(unused_attributes)]` to paper over incr.comp problem

Paper over the problem in rust-lang#58633.

r? @Mark-Simulacrum
  • Loading branch information
Centril authored Dec 8, 2019
2 parents 56c0bea + baeed92 commit b8e921b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/libcore/convert/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit b8e921b

Please sign in to comment.