Auto merge of #48989 - ExpHP:path-prefix, r=dtolnay

Make signature of Path::strip_prefix accept non-references

I did this a while back but didn't submit a PR. Might as well see what happens.

Fixes #48390.

**Note: This has the potential to cause regressions in type inference.**  However, in order for code to break, it would need to be relying on the signature to determine that a type is `&_`, while still being able to figure out what the `_` is.  I'm having a hard time imagining such a scenario in real code.
This commit is contained in:
bors
2018-04-24 01:15:36 +00:00

View File

@@ -298,10 +298,9 @@ pub const MAIN_SEPARATOR: char = ::sys::path::MAIN_SEP;
// Iterate through `iter` while it matches `prefix`; return `None` if `prefix` // Iterate through `iter` while it matches `prefix`; return `None` if `prefix`
// is not a prefix of `iter`, otherwise return `Some(iter_after_prefix)` giving // is not a prefix of `iter`, otherwise return `Some(iter_after_prefix)` giving
// `iter` after having exhausted `prefix`. // `iter` after having exhausted `prefix`.
fn iter_after<A, I, J>(mut iter: I, mut prefix: J) -> Option<I> fn iter_after<'a, 'b, I, J>(mut iter: I, mut prefix: J) -> Option<I>
where I: Iterator<Item = A> + Clone, where I: Iterator<Item = Component<'a>> + Clone,
J: Iterator<Item = A>, J: Iterator<Item = Component<'b>>,
A: PartialEq
{ {
loop { loop {
let mut iter_next = iter.clone(); let mut iter_next = iter.clone();
@@ -1967,7 +1966,7 @@ impl Path {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// use std::path::Path; /// use std::path::{Path, PathBuf};
/// ///
/// let path = Path::new("/test/haha/foo.txt"); /// let path = Path::new("/test/haha/foo.txt");
/// ///
@@ -1978,17 +1977,20 @@ impl Path {
/// assert_eq!(path.strip_prefix("/test/haha/foo.txt/"), Ok(Path::new(""))); /// assert_eq!(path.strip_prefix("/test/haha/foo.txt/"), Ok(Path::new("")));
/// assert_eq!(path.strip_prefix("test").is_ok(), false); /// assert_eq!(path.strip_prefix("test").is_ok(), false);
/// assert_eq!(path.strip_prefix("/haha").is_ok(), false); /// assert_eq!(path.strip_prefix("/haha").is_ok(), false);
///
/// let prefix = PathBuf::from("/test/");
/// 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: ?Sized>(&'a self, base: &'a 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: &'a 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(()))