diff options
| author | bors <bors@rust-lang.org> | 2018-03-30 16:44:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-30 16:44:15 +0000 |
| commit | f1c21b0e676351660b3e7c9014b8bd25fc7fa30a (patch) | |
| tree | e9a7cabc99949fd99c6012029b116b615b637bc2 /src/libstd | |
| parent | a6f1c6a3eee2c09e99935083665e5d034871a0e4 (diff) | |
| parent | ba4f310e3fc961af7b9e6db52c53b51244473ae7 (diff) | |
| download | rust-f1c21b0e676351660b3e7c9014b8bd25fc7fa30a.tar.gz rust-f1c21b0e676351660b3e7c9014b8bd25fc7fa30a.zip | |
Auto merge of #49518 - SimonSapin:prelude, r=alexcrichton
Revert "Add TryFrom and TryInto to the prelude" This reverts commit 09008cc23ff6395c2c928f3690e07d7389d08ebc. This addition landed in https://github.com/rust-lang/rust/pull/49305 and turned out to break crates that had their own copy of `TryFrom` in order to use it on the Stable channel :( We’ll explore the possibility of the 2018 edition having a different prelude that includes this traits. However per the editions RFC this requires implementing a warning in the 2015 edition for code that *would* break.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/prelude/v1.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs index d5b7c68a3fa..feedd4e1abe 100644 --- a/src/libstd/prelude/v1.rs +++ b/src/libstd/prelude/v1.rs @@ -35,8 +35,6 @@ #[doc(no_inline)] pub use cmp::{PartialEq, PartialOrd, Eq, Ord}; #[stable(feature = "rust1", since = "1.0.0")] #[doc(no_inline)] pub use convert::{AsRef, AsMut, Into, From}; -#[stable(feature = "try_from", since = "1.26.0")] -#[doc(no_inline)] pub use convert::{TryFrom, TryInto}; #[stable(feature = "rust1", since = "1.0.0")] #[doc(no_inline)] pub use default::Default; #[stable(feature = "rust1", since = "1.0.0")] |