From 85f13f0d42fe7ee0a5850a271e8a1c975ad5b85f Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 8 Feb 2019 14:54:22 +0100
Subject: Add a convert::Infallible empty enum, make string::ParseError an
 alias

---
 src/libstd/path.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/libstd/path.rs')

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))
-- 
cgit 1.4.1-3-g733a5