diff options
| author | bors <bors@rust-lang.org> | 2013-08-30 20:30:35 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-30 20:30:35 -0700 |
| commit | 5fe553d30f6e3ef7c021092533f1d7c74f6e8fb6 (patch) | |
| tree | 35f5487b8f0783cf6cae2a34b27317cc9786ae91 | |
| parent | 206ad61fd8e1eb6ff8a05406b70f46d1df766c01 (diff) | |
| parent | b9601c48a525dcdc569052e65c3c6b93833f3011 (diff) | |
| download | rust-5fe553d30f6e3ef7c021092533f1d7c74f6e8fb6.tar.gz rust-5fe553d30f6e3ef7c021092533f1d7c74f6e8fb6.zip | |
auto merge of #8862 : dcrewi/rust/drop-redundant-ord-impls, r=thestinger
If this were to break something, I would expect existing tests to catch it, and a `make check` run passes locally.
| -rw-r--r-- | src/libextra/json.rs | 5 | ||||
| -rw-r--r-- | src/libextra/semver.rs | 14 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/libextra/json.rs b/src/libextra/json.rs index a13836d87bd..911d53da909 100644 --- a/src/libextra/json.rs +++ b/src/libextra/json.rs @@ -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 diff --git a/src/libextra/semver.rs b/src/libextra/semver.rs index b0f89e219d8..8f7c6a03d1a 100644 --- a/src/libextra/semver.rs +++ b/src/libextra/semver.rs @@ -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 { |
