diff options
| author | bors <bors@rust-lang.org> | 2016-02-23 17:21:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-23 17:21:18 +0000 |
| commit | 43ddfbdfb2cfc63646db395751f108617f0e39b4 (patch) | |
| tree | 8eb98d6508f71375dbe0afa17b62c5498fc9342a /src/libstd/ffi | |
| parent | 0de3cace0a213f4fd4d843f59638c8be71354335 (diff) | |
| parent | 409bffa6545ffb760403a82f5fb27678ad2a0aca (diff) | |
| download | rust-43ddfbdfb2cfc63646db395751f108617f0e39b4.tar.gz rust-43ddfbdfb2cfc63646db395751f108617f0e39b4.zip | |
Auto merge of #31751 - gkoz:os_str_path_cmp, r=aturon
Diffstat (limited to 'src/libstd/ffi')
| -rw-r--r-- | src/libstd/ffi/os_str.rs | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs index 90ea7396a8a..cf4f4bdf291 100644 --- a/src/libstd/ffi/os_str.rs +++ b/src/libstd/ffi/os_str.rs @@ -411,6 +411,44 @@ impl Ord for OsStr { fn cmp(&self, other: &OsStr) -> cmp::Ordering { self.bytes().cmp(other.bytes()) } } +macro_rules! impl_cmp { + ($lhs:ty, $rhs: ty) => { + #[stable(feature = "cmp_os_str", since = "1.8.0")] + impl<'a, 'b> PartialEq<$rhs> for $lhs { + #[inline] + fn eq(&self, other: &$rhs) -> bool { <OsStr as PartialEq>::eq(self, other) } + } + + #[stable(feature = "cmp_os_str", since = "1.8.0")] + impl<'a, 'b> PartialEq<$lhs> for $rhs { + #[inline] + fn eq(&self, other: &$lhs) -> bool { <OsStr as PartialEq>::eq(self, other) } + } + + #[stable(feature = "cmp_os_str", since = "1.8.0")] + impl<'a, 'b> PartialOrd<$rhs> for $lhs { + #[inline] + fn partial_cmp(&self, other: &$rhs) -> Option<cmp::Ordering> { + <OsStr as PartialOrd>::partial_cmp(self, other) + } + } + + #[stable(feature = "cmp_os_str", since = "1.8.0")] + impl<'a, 'b> PartialOrd<$lhs> for $rhs { + #[inline] + fn partial_cmp(&self, other: &$lhs) -> Option<cmp::Ordering> { + <OsStr as PartialOrd>::partial_cmp(self, other) + } + } + } +} + +impl_cmp!(OsString, OsStr); +impl_cmp!(OsString, &'a OsStr); +impl_cmp!(Cow<'a, OsStr>, OsStr); +impl_cmp!(Cow<'a, OsStr>, &'b OsStr); +impl_cmp!(Cow<'a, OsStr>, OsString); + #[stable(feature = "rust1", since = "1.0.0")] impl Hash for OsStr { #[inline] |
