Skip to content

Commit

Permalink
Auto merge of #50402 - alexcrichton:beta-next, r=sfackler
Browse files Browse the repository at this point in the history
[beta] Revert "Implement FromStr for PathBuf"

This is a backport of #50401
  • Loading branch information
bors committed May 3, 2018
2 parents 3b390d3 + 3d8ad83 commit 1f200ac
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions src/libstd/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ use io;
use iter::{self, FusedIterator};
use ops::{self, Deref};
use rc::Rc;
use str::FromStr;
use sync::Arc;

use ffi::{OsStr, OsString};
Expand Down Expand Up @@ -1442,32 +1441,6 @@ impl From<String> for PathBuf {
}
}

/// Error returned from [`PathBuf::from_str`][`from_str`].
///
/// Note that parsing a path will never fail. This error is just a placeholder
/// for implementing `FromStr` for `PathBuf`.
///
/// [`from_str`]: struct.PathBuf.html#method.from_str
#[derive(Debug, Clone, PartialEq, Eq)]
#[stable(feature = "path_from_str", since = "1.26.0")]
pub enum ParsePathError {}

#[stable(feature = "path_from_str", since = "1.26.0")]
impl fmt::Display for ParsePathError {
fn fmt(&self, _: &mut fmt::Formatter) -> fmt::Result {
match *self {}
}
}

#[stable(feature = "path_from_str", since = "1.26.0")]
impl FromStr for PathBuf {
type Err = ParsePathError;

fn from_str(s: &str) -> Result<Self, Self::Err> {
Ok(PathBuf::from(s))
}
}

#[stable(feature = "rust1", since = "1.0.0")]
impl<P: AsRef<Path>> iter::FromIterator<P> for PathBuf {
fn from_iter<I: IntoIterator<Item = P>>(iter: I) -> PathBuf {
Expand Down

0 comments on commit 1f200ac

Please sign in to comment.