---

yaml
---
r: 95415
b: refs/heads/dist-snap
c: 40b324f
h: refs/heads/master
i:
  95413: e57fe31
  95411: f9c34fc
  95407: 35f95d3
v: v3

Author: lilyball

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 0c7e8f7a92318d19fd9de96ba70fa36fc41de1e2
+refs/heads/dist-snap: 40b324f0dec364a9fa71f9f8b47b8ab156f6d61e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/path/mod.rs

@@ -179,9 +179,6 @@ pub trait GenericPath: Clone + GenericPathUnsafe {
         str::from_utf8_slice_opt(self.as_vec())
     }
 
-    /// Converts the Path into an owned string, if possible
-    fn into_str(self) -> Option<~str>;
-
     /// Returns the path as a byte vector
     fn as_vec<'a>(&'a self) -> &'a [u8];
 

branches/dist-snap/src/libstd/path/posix.rs

@@ -178,10 +178,6 @@ impl GenericPath for Path {
         self.repr
     }
 
-    fn into_str(self) -> Option<~str> {
-        str::from_utf8_owned_opt(self.repr)
-    }
-
     fn dirname<'a>(&'a self) -> &'a [u8] {
         match self.sepidx {
             None if bytes!("..") == self.repr => self.repr.as_slice(),
@@ -614,12 +610,9 @@ mod tests {
         assert_eq!(Path::new(b!("foo/bar")).into_vec(), b!("foo/bar").to_owned());
         assert_eq!(Path::new(b!("/foo/../../bar")).into_vec(),
                    b!("/bar").to_owned());
-        assert_eq!(Path::new("foo/bar").into_str(), Some(~"foo/bar"));
-        assert_eq!(Path::new("/foo/../../bar").into_str(), Some(~"/bar"));
 
         let p = Path::new(b!("foo/bar", 0x80));
         assert_eq!(p.as_str(), None);
-        assert_eq!(Path::new(b!("foo", 0xff, "/bar")).into_str(), None);
     }
 
     #[test]

branches/dist-snap/src/libstd/path/windows.rs

@@ -327,13 +327,6 @@ impl GenericPath for Path {
         Some(self.repr.as_slice())
     }
 
-    /// See `GenericPath::into_str` for info.
-    /// Always returns a `Some` value.
-    #[inline]
-    fn into_str(self) -> Option<~str> {
-        Some(self.repr)
-    }
-
     #[inline]
     fn as_vec<'a>(&'a self) -> &'a [u8] {
         self.repr.as_bytes()
@@ -1260,8 +1253,6 @@ mod tests {
         assert_eq!(Path::new(b!("foo\\bar")).into_vec(), b!("foo\\bar").to_owned());
         assert_eq!(Path::new(b!("\\foo\\..\\..\\bar")).into_vec(),
                    b!("\\bar").to_owned());
-        assert_eq!(Path::new("foo\\bar").into_str(), Some(~"foo\\bar"));
-        assert_eq!(Path::new("\\foo\\..\\..\\bar").into_str(), Some(~"\\bar"));
 
         t!(s: Path::new("\\\\a"), "\\a");
         t!(s: Path::new("\\\\a\\"), "\\a");