Skip to content

Commit b8e921b

Browse files
authored
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
2 parents 56c0bea + baeed92 commit b8e921b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

src/libcore/convert/mod.rs

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

0 commit comments

Comments
 (0)