rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

elide elidable lifetime in Path::strip_prefix

Browse Source
This commit is contained in:
Michael Lamparski
2018-03-17 20:02:55 -04:00
parent 0d0a470b89
commit 7cbc93b14f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/path.rs
View File

@@ -1880,15 +1880,15 @@ impl Path {
/// assert_eq!(path.strip_prefix(prefix), Ok(Path::new("haha/foo.txt"))); /// assert_eq!(path.strip_prefix(prefix), Ok(Path::new("haha/foo.txt")));
/// ``` /// ```
#[stable(since = "1.7.0", feature = "path_strip_prefix")] #[stable(since = "1.7.0", feature = "path_strip_prefix")]
pub fn strip_prefix<'a, P>(&'a self, base: P) pub fn strip_prefix<P>(&self, base: P)
-> Result<&'a Path, StripPrefixError> -> Result<&Path, StripPrefixError>
where P: AsRef<Path> where P: AsRef<Path>
{ {
self._strip_prefix(base.as_ref()) self._strip_prefix(base.as_ref())
} }
fn _strip_prefix<'a>(&'a self, base: &Path) fn _strip_prefix(&self, base: &Path)
-> Result<&'a Path, StripPrefixError> { -> Result<&Path, StripPrefixError> {
iter_after(self.components(), base.components()) iter_after(self.components(), base.components())
.map(|c| c.as_path()) .map(|c| c.as_path())
.ok_or(StripPrefixError(())) .ok_or(StripPrefixError(()))