Merge remote-tracking branch 'remotes/origin/master' into remove-str-trailing-nulls

This commit is contained in:
Erick Tryzelaar
2013-08-09 18:48:01 -07:00
73 changed files with 1740 additions and 1109 deletions

View File

@@ -1243,34 +1243,16 @@ pub mod traits {
impl<'self> Ord for &'self str {
#[inline]
fn lt(&self, other: & &'self str) -> bool { self.cmp(other) == Less }
#[inline]
fn le(&self, other: & &'self str) -> bool { self.cmp(other) != Greater }
#[inline]
fn ge(&self, other: & &'self str) -> bool { self.cmp(other) != Less }
#[inline]
fn gt(&self, other: & &'self str) -> bool { self.cmp(other) == Greater }
}
impl Ord for ~str {
#[inline]
fn lt(&self, other: &~str) -> bool { self.cmp(other) == Less }
#[inline]
fn le(&self, other: &~str) -> bool { self.cmp(other) != Greater }
#[inline]
fn ge(&self, other: &~str) -> bool { self.cmp(other) != Less }
#[inline]
fn gt(&self, other: &~str) -> bool { self.cmp(other) == Greater }
}
impl Ord for @str {
#[inline]
fn lt(&self, other: &@str) -> bool { self.cmp(other) == Less }
#[inline]
fn le(&self, other: &@str) -> bool { self.cmp(other) != Greater }
#[inline]
fn ge(&self, other: &@str) -> bool { self.cmp(other) != Less }
#[inline]
fn gt(&self, other: &@str) -> bool { self.cmp(other) == Greater }
}
impl<'self, S: Str> Equiv<S> for &'self str {