---

yaml
---
r: 152379
b: refs/heads/try2
c: e8d180d
h: refs/heads/master
i:
  152377: b70b6d5
  152375: a867e19
v: v3

Author: huonw

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 9239bb4960b78f354883edd588127653765514b2
+refs/heads/try2: e8d180df46ef72c169f8746221c4fd19e72232e9
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/etc/licenseck.py

@@ -43,7 +43,6 @@
     "libstd/sync/mpmc_bounded_queue.rs", # BSD
     "libsync/mpsc_intrusive.rs", # BSD
     "test/bench/shootout-meteor.rs", # BSD
-    "test/bench/shootout-regex-dna.rs", # BSD
 ]
 
 def check_license(name, contents):

branches/try2/src/libcollections/dlist.rs

@@ -24,7 +24,6 @@
 use core::prelude::*;
 
 use alloc::owned::Box;
-use core::fmt;
 use core::iter;
 use core::mem;
 use core::ptr;
@@ -609,19 +608,6 @@ impl<A: Clone> Clone for DList<A> {
     }
 }
 
-impl<A: fmt::Show> fmt::Show for DList<A> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        try!(write!(f, "["));
-
-        for (i, e) in self.iter().enumerate() {
-            if i != 0 { try!(write!(f, ", ")); }
-            try!(write!(f, "{}", *e));
-        }
-
-        write!(f, "]")
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use std::prelude::*;
@@ -1041,17 +1027,6 @@ mod tests {
         }
     }
 
-    #[test]
-    fn test_show() {
-        let list: DList<int> = range(0, 10).collect();
-        assert!(list.to_str().as_slice() == "[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]");
-
-        let list: DList<&str> = vec!["just", "one", "test", "more"].iter()
-                                                                   .map(|&s| s)
-                                                                   .collect();
-        assert!(list.to_str().as_slice() == "[just, one, test, more]");
-    }
-
     #[cfg(test)]
     fn fuzz_test(sz: int) {
         let mut m: DList<int> = DList::new();

branches/try2/src/libcollections/smallintmap.rs

@@ -17,7 +17,6 @@
 
 use core::prelude::*;
 
-use core::fmt;
 use core::iter::{Enumerate, FilterMap};
 use core::mem::replace;
 
@@ -177,18 +176,6 @@ impl<V:Clone> SmallIntMap<V> {
     }
 }
 
-impl<V: fmt::Show> fmt::Show for SmallIntMap<V> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        try!(write!(f, r"\{"));
-
-        for (i, (k, v)) in self.iter().enumerate() {
-            if i != 0 { try!(write!(f, ", ")); }
-            try!(write!(f, "{}: {}", k, *v));
-        }
-
-        write!(f, r"\}")
-    }
-}
 
 macro_rules! iterator {
     (impl $name:ident -> $elem:ty, $getter:ident) => {
@@ -474,20 +461,6 @@ mod test_map {
         assert!(called);
         m.insert(2, box 1);
     }
-
-    #[test]
-    fn test_show() {
-        let mut map = SmallIntMap::new();
-        let empty = SmallIntMap::<int>::new();
-
-        map.insert(1, 2);
-        map.insert(3, 4);
-
-        let map_str = map.to_str();
-        let map_str = map_str.as_slice();
-        assert!(map_str == "{1: 2, 3: 4}" || map_str == "{3: 4, 1: 2}");
-        assert_eq!(format!("{}", empty), "{}".to_string());
-    }
 }
 
 #[cfg(test)]

branches/try2/src/libcore/cmp.rs

@@ -39,14 +39,13 @@
 
 /// Trait for values that can be compared for equality and inequality.
 ///
-/// This trait allows for partial equality, for types that do not have an
-/// equivalence relation. For example, in floating point numbers `NaN != NaN`,
-/// so floating point types implement `PartialEq` but not `Eq`.
+/// This trait allows partial equality, where types can be unordered instead of
+/// strictly equal or unequal. For example, with the built-in floating-point
+/// types `a == b` and `a != b` will both evaluate to false if either `a` or
+/// `b` is NaN (cf. IEEE 754-2008 section 5.11).
 ///
-/// PartialEq only requires the `eq` method to be implemented; `ne` is defined
-/// in terms of it by default. Any manual implementation of `ne` *must* respect
-/// the rule that `eq` is a strict inverse of `ne`; that is, `!(a == b)` if and
-/// only if `a != b`.
+/// PartialEq only requires the `eq` method to be implemented; `ne` is its negation by
+/// default.
 ///
 /// Eventually, this will be implemented by default for types that implement
 /// `Eq`.
@@ -148,10 +147,9 @@ pub fn lexical_ordering(o1: Ordering, o2: Ordering) -> Ordering {
 /// PartialOrd only requires implementation of the `lt` method,
 /// with the others generated from default implementations.
 ///
-/// However it remains possible to implement the others separately for types
-/// which do not have a total order. For example, for floating point numbers,
-/// `NaN < 0 == false` and `NaN >= 0 == false` (cf. IEEE 754-2008 section
-/// 5.11).
+/// However it remains possible to implement the others separately,
+/// for compatibility with floating-point NaN semantics
+/// (cf. IEEE 754-2008 section 5.11).
 #[lang="ord"]
 pub trait PartialOrd: PartialEq {
     /// This method tests less than (for `self` and `other`) and is used by the `<` operator.

branches/try2/src/librustc/middle/lang_items.rs

@@ -187,11 +187,11 @@ impl<'a> LanguageItemCollector<'a> {
 
 pub fn extract(attrs: &[ast::Attribute]) -> Option<InternedString> {
     for attribute in attrs.iter() {
-        match attribute.value_str() {
-            Some(ref value) if attribute.check_name("lang") => {
-                return Some(value.clone());
+        match attribute.name_str_pair() {
+            Some((ref key, ref value)) if key.equiv(&("lang")) => {
+                return Some((*value).clone());
             }
-            _ => {}
+            Some(..) | None => {}
         }
     }