Skip to content

Commit e92338e

Browse files
committed
experiment: remove reservation impl
1 parent e51d87b commit e92338e

4 files changed

Lines changed: 14 additions & 56 deletions

File tree

library/core/src/convert/mod.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -788,20 +788,20 @@ impl<T> const From<T> for T {
788788
}
789789
}
790790

791-
/// **Stability note:** This impl does not yet exist, but we are
792-
/// "reserving space" to add it in the future. See
793-
/// [rust-lang/rust#64715][#64715] for details.
794-
///
795-
/// [#64715]: https://github.com/rust-lang/rust/issues/64715
796-
#[stable(feature = "convert_infallible", since = "1.34.0")]
797-
#[rustc_reservation_impl = "permitting this impl would forbid us from adding \
798-
`impl<T> From<!> for T` later; see rust-lang/rust#64715 for details"]
799-
#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
800-
impl<T> const From<!> for T {
801-
fn from(t: !) -> T {
802-
t
803-
}
804-
}
791+
// /// **Stability note:** This impl does not yet exist, but we are
792+
// /// "reserving space" to add it in the future. See
793+
// /// [rust-lang/rust#64715][#64715] for details.
794+
// ///
795+
// /// [#64715]: https://github.com/rust-lang/rust/issues/64715
796+
// #[stable(feature = "convert_infallible", since = "1.34.0")]
797+
// #[rustc_reservation_impl = "permitting this impl would forbid us from adding \
798+
// `impl<T> From<!> for T` later; see rust-lang/rust#64715 for details"]
799+
// #[rustc_const_unstable(feature = "const_convert", issue = "143773")]
800+
// impl<T> const From<!> for T {
801+
// fn from(t: !) -> T {
802+
// t
803+
// }
804+
// }
805805

806806
// TryFrom implies TryInto
807807
#[stable(feature = "try_from", since = "1.34.0")]

tests/ui/never_type/never-from-impl-is-reserved.current.stderr

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/ui/never_type/never-from-impl-is-reserved.next.stderr

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/ui/never_type/never-from-impl-is-reserved.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)