---

brson · brson · commit 48753a99ffa8 · 2015-03-23T10:22:17.000-07:00
yaml --- r: 194255 b: refs/heads/tmp c: 9ec9bc6 h: refs/heads/master i: 194253: 58483a5 194251: 6ff4fbb 194247: 35f87f4 194239: 09a09d7 v: v3
diff --git a/[refs] b/[refs]
@@ -34,7 +34,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: a3b13610c5b93d9ada072471a001a5613df6a960
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 2625bf9ae4a46000ae3a138f938f8f1dd3c095a8
+refs/heads/tmp: 9ec9bc68fb310aac29e984d26cc37952de328f1e
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 28a0b25f424090255966273994748a9f9901059f
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412
diff --git a/branches/tmp/src/libstd/path.rs b/branches/tmp/src/libstd/path.rs
@@ -1243,6 +1243,9 @@ impl Path {
     }
 
     /// Returns a path that, when joined onto `base`, yields `self`.
+    ///
+    /// If `base` is not a prefix of `self` (i.e. `starts_with`
+    /// returns false), then `relative_from` returns `None`.
     #[unstable(feature = "path_relative_from", reason = "see #23284")]
     pub fn relative_from<'a, P: ?Sized>(&'a self, base: &'a P) -> Option<&Path> where
         P: AsPath

Original file line number	Diff line number	Diff line change
`@@ -1243,6 +1243,9 @@ impl Path {`
`1243`	`1243`	`}`
`1244`	`1244`
`1245`	`1245`	/// Returns a path that, when joined onto `base`, yields `self`.
	`1246`	`+ ///`
	`1247`	+ /// If `base` is not a prefix of `self` (i.e. `starts_with`
	`1248`	+ /// returns false), then `relative_from` returns `None`.
`1246`	`1249`	`#[unstable(feature = "path_relative_from", reason = "see #23284")]`
`1247`	`1250`	`pub fn relative_from<'a, P: ?Sized>(&'a self, base: &'a P) -> Option<&Path> where`
`1248`	`1251`	`P: AsPath`