From e48fa2be324a7ebee50c24cf77506e9eb0a0c339 Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Fri, 6 Dec 2019 22:17:32 +0100
Subject: [PATCH 1/2] use `#[allow(unused_attributes)]` to paper over incr.comp
problem
---
src/libcore/convert/mod.rs | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/libcore/convert/mod.rs b/src/libcore/convert/mod.rs
index 16d5375059fee..bd2d85c94c729 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)]
#[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 {
From baeed9266d316eb937ab6180ff8ba500c52fbaa0 Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Fri, 6 Dec 2019 22:21:31 +0100
Subject: [PATCH 2/2] leave a FIXME
---
src/libcore/convert/mod.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libcore/convert/mod.rs b/src/libcore/convert/mod.rs
index bd2d85c94c729..5414d9ac2344a 100644
--- a/src/libcore/convert/mod.rs
+++ b/src/libcore/convert/mod.rs
@@ -567,7 +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)]
+#[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 {