diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2019-02-08 14:54:22 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2019-02-13 18:00:18 +0100 |
| commit | 85f13f0d42fe7ee0a5850a271e8a1c975ad5b85f (patch) | |
| tree | 82cbf19af07bbd7faa715f8f9406ba972fbd9a27 /src/libstd | |
| parent | e54494727855cd14229f5d456591ed2a2f027c46 (diff) | |
| download | rust-85f13f0d42fe7ee0a5850a271e8a1c975ad5b85f.tar.gz rust-85f13f0d42fe7ee0a5850a271e8a1c975ad5b85f.zip | |
Add a convert::Infallible empty enum, make string::ParseError an alias
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/path.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs index 0f1d627fa1e..d9199666e58 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -78,7 +78,6 @@ use iter::{self, FusedIterator}; use ops::{self, Deref}; use rc::Rc; use str::FromStr; -use string::ParseError; use sync::Arc; use ffi::{OsStr, OsString}; @@ -1453,7 +1452,7 @@ impl From<String> for PathBuf { #[stable(feature = "path_from_str", since = "1.32.0")] impl FromStr for PathBuf { - type Err = ParseError; + type Err = core::convert::Infallible; fn from_str(s: &str) -> Result<Self, Self::Err> { Ok(PathBuf::from(s)) |