about summary refs log tree commit diff
path: root/library/core/src/convert
diff options
context:
space:
mode:
authorDeadbeef <ent3rm4n@gmail.com>2021-12-05 18:46:29 +0800
committerDeadbeef <ent3rm4n@gmail.com>2021-12-12 12:34:59 +0800
commite22fe4008ca9db3d2b183d8df95a800d830d1edb (patch)
treefb6704f490a55bd0d53aee5fa98c7da94ae9dccc /library/core/src/convert
parent84b1d859c8caa6049bfe728b219f679286151bb2 (diff)
downloadrust-e22fe4008ca9db3d2b183d8df95a800d830d1edb.tar.gz
rust-e22fe4008ca9db3d2b183d8df95a800d830d1edb.zip
Revert "Auto merge of #89450 - usbalbin:const_try_revert, r=oli-obk"
This reverts commit a8387aef8c378a771686878062e544af4d5e2245, reversing
changes made to 6e1211081239be62a5d0bb3bbcb29a9f14621c81.
Diffstat (limited to 'library/core/src/convert')
-rw-r--r--library/core/src/convert/mod.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/library/core/src/convert/mod.rs b/library/core/src/convert/mod.rs
index 5aa53deee34..1c2e673d604 100644
--- a/library/core/src/convert/mod.rs
+++ b/library/core/src/convert/mod.rs
@@ -534,9 +534,10 @@ where
 
 // From implies Into
 #[stable(feature = "rust1", since = "1.0.0")]
-impl<T, U> Into<U> for T
+#[rustc_const_unstable(feature = "const_convert", issue = "88674")]
+impl<T, U> const Into<U> for T
 where
-    U: From<T>,
+    U: ~const From<T>,
 {
     fn into(self) -> U {
         U::from(self)