From: bors <bors@rust-lang.org>
Date: Mon, 12 Aug 2013 18:53:18 +0000 (-0700)
Subject: auto merge of #8400 : blake2-ppc/rust/seq-ord, r=cmr
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=35040275b3f39618c3cec4a9f702b6e057309604;p=rust.git

auto merge of #8400 : blake2-ppc/rust/seq-ord, r=cmr

Use Eq + Ord for lexicographical ordering of sequences.

For each of <, <=, >= or > as R, use::

    [x, ..xs] R [y, ..ys]  =  if x != y { x R y } else { xs R ys }

Previous code using `a < b` and then `!(b < a)` for short-circuiting
fails on cases such as  [1.0, 2.0] < [0.0/0.0, 3.0], where the first
element was effectively considered equal.

Containers like &[T] did also implement only one comparison operator `<`,
and derived the comparison results from this. This isn't correct either for
Ord.

Implement functions in `std::iterator::order::{lt,le,gt,ge,equal,cmp}` that all
iterable containers can use for lexical order.

We also visit tuple ordering, having the same problem and same solution
(but differing implementation).
---

35040275b3f39618c3cec4a9f702b6e057309604
diff --cc src/libstd/vec.rs
index d626b8604db,e088fd9a647..2228922d9e4
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@@ -561,12 -561,12 +561,12 @@@ impl<'self, T> RandomAccessIterator<&'s
  
  #[cfg(not(test))]
  pub mod traits {
 -    use super::Vector;
 +    use super::*;
  
      use clone::Clone;
-     use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Equal, Equiv};
+     use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Equiv};
+     use iterator::order;
      use ops::Add;
-     use option::{Some, None};
  
      impl<'self,T:Eq> Eq for &'self [T] {
          fn eq(&self, other: & &'self [T]) -> bool {