---

brson · brson · commit 0bcb64f6d828 · 2015-03-23T10:22:17.000-07:00
yaml --- r: 191954 b: refs/heads/snap-stage3 c: 9ec9bc6 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 809a554fca2d0ebc2ba50077016fe282a4064752
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 2625bf9ae4a46000ae3a138f938f8f1dd3c095a8
+refs/heads/snap-stage3: 9ec9bc68fb310aac29e984d26cc37952de328f1e
 refs/heads/try: ce76bff75603a754d092456285ff455eb871633d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
diff --git a/branches/snap-stage3/src/libstd/path.rs b/branches/snap-stage3/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`