bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #8862 : dcrewi/rust/drop-redundant-ord-impls, r=thestinger

Browse source 
If this were to break something, I would expect existing tests to catch it, and a `make check` run passes locally.
This commit is contained in:
bors 2013-08-30 20:30:35 -07:00
commit 5fe553d30f
2 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libextra/json.rs
View file

@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -1164,9 +1164,6 @@ impl Ord for Json {
}
}
}
fn le(&self, other: &Json) -> bool { !(*other).lt(&(*self)) }
fn ge(&self, other: &Json) -> bool { !(*self).lt(other) }
fn gt(&self, other: &Json) -> bool { (*other).lt(&(*self)) }
}
/// A trait for converting values to JSON

14
src/libextra/semver.rs
View file

@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -37,18 +37,6 @@ impl cmp::Ord for Identifier {
(&AlphaNumeric(_), _) => false
}
}
#[inline]
fn le(&self, other: &Identifier) -> bool {
! (other < self)
}
#[inline]
fn gt(&self, other: &Identifier) -> bool {
other < self
}
#[inline]
fn ge(&self, other: &Identifier) -> bool {
! (self < other)
}
}
impl ToStr for Identifier {