---

yaml
---
r: 68587
b: refs/heads/auto
c: 451c943
h: refs/heads/master
i:
  68585: 7801eb8
  68583: 0e71cd4
v: v3

Author: brson

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 87b61296a5cee1eaf7aecc130afa27d63887f707
+refs/heads/auto: 451c94343f2c49cfcc790816fd8587bfdc7ecfb8
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libextra/treemap.rs

@@ -57,25 +57,23 @@ impl<K: Eq + TotalOrd, V: Eq> Eq for TreeMap<K, V> {
 }
 
 // Lexicographical comparison
-fn lt<K: Ord + TotalOrd, V: Ord>(a: &TreeMap<K, V>,
+fn lt<K: Ord + TotalOrd, V>(a: &TreeMap<K, V>,
                                  b: &TreeMap<K, V>) -> bool {
     let mut x = a.iter();
     let mut y = b.iter();
 
     let (a_len, b_len) = (a.len(), b.len());
     for uint::min(a_len, b_len).times {
-        let (key_a, value_a) = x.next().unwrap();
-        let (key_b, value_b) = y.next().unwrap();
+        let (key_a,_) = x.next().unwrap();
+        let (key_b,_) = y.next().unwrap();
         if *key_a < *key_b { return true; }
         if *key_a > *key_b { return false; }
-        if *value_a < *value_b { return true; }
-        if *value_a > *value_b { return false; }
-    }
+    };
 
     a_len < b_len
 }
 
-impl<K: Ord + TotalOrd, V: Ord> Ord for TreeMap<K, V> {
+impl<K: Ord + TotalOrd, V> Ord for TreeMap<K, V> {
     #[inline]
     fn lt(&self, other: &TreeMap<K, V>) -> bool { lt(self, other) }
     #[inline]
@@ -937,7 +935,7 @@ mod test_treemap {
         assert!(b.insert(0, 5));
         assert!(a < b);
         assert!(a.insert(0, 7));
-        assert!(!(a < b) && b < a);
+        assert!(!(a < b) && !(b < a));
         assert!(b.insert(-2, 0));
         assert!(b < a);
         assert!(a.insert(-5, 2));

branches/auto/src/librusti/rusti.rs

@@ -511,7 +511,8 @@ pub fn main() {
     }
 }
 
-#[cfg(test)]
+//#[cfg(test)]
+#[cfg(ignore)] // FIXME #7541 doesn't work under cross-compile
 mod tests {
     use std::io;
     use std::iterator::IteratorUtil;