bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add mutual PartialOrd impls for Path and PathBuf

Browse source
This commit is contained in:
Gleb Kozyrev 2016-02-18 16:07:12 +02:00
parent 27be4336d9
commit ccad5449ff
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/libstd/path.rs
View file

@ -2051,7 +2051,7 @@ impl<'a> IntoIterator for &'a Path {
fn into_iter(self) -> Iter<'a> { self.iter() } fn into_iter(self) -> Iter<'a> { self.iter() }
} }
macro_rules! impl_eq { macro_rules! impl_cmp {
($lhs:ty, $rhs: ty) => { ($lhs:ty, $rhs: ty) => {
#[stable(feature = "partialeq_path", since = "1.6.0")] #[stable(feature = "partialeq_path", since = "1.6.0")]
impl<'a, 'b> PartialEq<$rhs> for $lhs { impl<'a, 'b> PartialEq<$rhs> for $lhs {
@ -2065,14 +2065,29 @@ macro_rules! impl_eq {
fn eq(&self, other: &$lhs) -> bool { <Path as PartialEq>::eq(self, other) } fn eq(&self, other: &$lhs) -> bool { <Path as PartialEq>::eq(self, other) }
} }
#[stable(feature = "cmp_path", since = "1.8.0")]
impl<'a, 'b> PartialOrd<$rhs> for $lhs {
#[inline]
fn partial_cmp(&self, other: &$rhs) -> Option<cmp::Ordering> {
<Path as PartialOrd>::partial_cmp(self, other)
}
}
#[stable(feature = "cmp_path", since = "1.8.0")]
impl<'a, 'b> PartialOrd<$lhs> for $rhs {
#[inline]
fn partial_cmp(&self, other: &$lhs) -> Option<cmp::Ordering> {
<Path as PartialOrd>::partial_cmp(self, other)
}
}
} }
} }
impl_eq!(PathBuf, Path); impl_cmp!(PathBuf, Path);
impl_eq!(PathBuf, &'a Path); impl_cmp!(PathBuf, &'a Path);
impl_eq!(Cow<'a, Path>, Path); impl_cmp!(Cow<'a, Path>, Path);
impl_eq!(Cow<'a, Path>, &'b Path); impl_cmp!(Cow<'a, Path>, &'b Path);
impl_eq!(Cow<'a, Path>, PathBuf); impl_cmp!(Cow<'a, Path>, PathBuf);
#[stable(since = "1.7.0", feature = "strip_prefix")] #[stable(since = "1.7.0", feature = "strip_prefix")]
impl fmt::Display for StripPrefixError { impl fmt::Display for StripPrefixError {