---

yaml
---
r: 152370
b: refs/heads/try2
c: 90339ef
h: refs/heads/master
v: v3

Author: Sawyer47

[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: bbd448a27c37dd95a9551c45606f865bff411a47
+refs/heads/try2: 90339ef18919be0212543a1b1f376c9c62c1d365
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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/typeck/check/_match.rs

@@ -460,7 +460,8 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
         {
             // no-op
         } else if !ty::type_is_numeric(b_ty) && !ty::type_is_char(b_ty) {
-            tcx.sess.span_err(pat.span, "non-numeric type used in range");
+            tcx.sess.span_err(pat.span,
+                "only char and numeric types are allowed in range");
         } else {
             match valid_range_bounds(fcx.ccx, begin, end) {
                 Some(false) => {

branches/try2/src/librustdoc/html/static/playpen.js

@@ -22,7 +22,7 @@
             a.attr('target', '_blank');
             $(this).append(a);
         }, function() {
-            $(this).find('a.test-arrow').remove();
+            $(this).find('a').remove();
         });
     }
 }());

branches/try2/src/libsyntax/ext/quote.rs

@@ -135,12 +135,6 @@ pub mod rt {
         }
     }
 
-    impl ToSource for ast::Arg {
-        fn to_source(&self) -> String {
-            pprust::arg_to_str(self)
-        }
-    }
-
     impl<'a> ToSource for &'a str {
         fn to_source(&self) -> String {
             let lit = dummy_spanned(ast::LitStr(
@@ -270,7 +264,6 @@ pub mod rt {
     impl_to_tokens!(Generics)
     impl_to_tokens!(@ast::Expr)
     impl_to_tokens!(ast::Block)
-    impl_to_tokens!(ast::Arg)
     impl_to_tokens_self!(&'a str)
     impl_to_tokens!(())
     impl_to_tokens!(char)

branches/try2/src/libsyntax/print/pprust.rs

@@ -242,10 +242,6 @@ pub fn variant_to_str(var: &ast::Variant) -> String {
     to_str(|s| s.print_variant(var))
 }
 
-pub fn arg_to_str(arg: &ast::Arg) -> String {
-    to_str(|s| s.print_arg(arg))
-}
-
 pub fn visibility_qualified(vis: ast::Visibility, s: &str) -> String {
     match vis {
         ast::Public => format!("pub {}", s).to_string(),

branches/try2/src/test/compile-fail/borrowck-field-sensitivity.rs

@@ -10,13 +10,15 @@
 
 struct A { a: int, b: Box<int> }
 
-fn deref_after_move() {
+fn borrow<T>(_: &T) { }
+
+fn use_after_move() {
     let x = A { a: 1, b: box 2 };
     drop(x.b);
     drop(*x.b); //~ ERROR use of partially moved value: `*x.b`
 }
 
-fn deref_after_fu_move() {
+fn use_after_fu_move() {
     let x = A { a: 1, b: box 2 };
     let y = A { a: 3, .. x };
     drop(*x.b); //~ ERROR use of partially moved value: `*x.b`
@@ -25,37 +27,35 @@ fn deref_after_fu_move() {
 fn borrow_after_move() {
     let x = A { a: 1, b: box 2 };
     drop(x.b);
-    let p = &x.b; //~ ERROR use of moved value: `x.b`
-    drop(**p);
+    borrow(&x.b); //~ ERROR use of moved value: `x.b`
 }
 
 fn borrow_after_fu_move() {
     let x = A { a: 1, b: box 2 };
     let _y = A { a: 3, .. x };
-    let p = &x.b; //~ ERROR use of moved value: `x.b`
-    drop(**p);
+    borrow(&x.b); //~ ERROR use of moved value: `x.b`
 }
 
 fn move_after_borrow() {
     let x = A { a: 1, b: box 2 };
-    let p = &x.b;
+    let y = &x.b;
     drop(x.b); //~ ERROR cannot move out of `x.b` because it is borrowed
-    drop(**p);
+    borrow(&*y);
 }
 
 fn fu_move_after_borrow() {
     let x = A { a: 1, b: box 2 };
-    let p = &x.b;
-    let _y = A { a: 3, .. x }; //~ ERROR cannot move out of `x.b` because it is borrowed
-    drop(**p);
+    let y = &x.b;
+    let _z = A { a: 3, .. x }; //~ ERROR cannot move out of `x.b` because it is borrowed
+    borrow(&*y);
 }
 
 fn mut_borrow_after_mut_borrow() {
     let mut x = A { a: 1, b: box 2 };
-    let p = &mut x.a;
-    let q = &mut x.a; //~ ERROR cannot borrow `x.a` as mutable more than once at a time
-    drop(*p);
-    drop(*q);
+    let y = &mut x.a;
+    let z = &mut x.a; //~ ERROR cannot borrow `x.a` as mutable more than once at a time
+    drop(*y);
+    drop(*z);
 }
 
 fn move_after_move() {
@@ -84,21 +84,7 @@ fn fu_move_after_fu_move() {
 
 // The following functions aren't yet accepted, but they should be.
 
-fn move_after_borrow_correct() {
-    let x = A { a: 1, b: box 2 };
-    let p = &x.a;
-    drop(x.b); //~ ERROR cannot move out of `x.b` because it is borrowed
-    drop(*p);
-}
-
-fn fu_move_after_borrow_correct() {
-    let x = A { a: 1, b: box 2 };
-    let p = &x.a;
-    let _y = A { a: 3, .. x }; //~ ERROR cannot move out of `x.b` because it is borrowed
-    drop(*p);
-}
-
-fn copy_after_field_assign_after_uninit() {
+fn use_after_field_assign_after_uninit() {
     let mut x: A;
     x.a = 1;
     drop(x.a); //~ ERROR use of possibly uninitialized variable: `x.a`
@@ -107,8 +93,7 @@ fn copy_after_field_assign_after_uninit() {
 fn borrow_after_field_assign_after_uninit() {
     let mut x: A;
     x.a = 1;
-    let p = &x.a; //~ ERROR use of possibly uninitialized variable: `x.a`
-    drop(*p);
+    borrow(&x.a); //~ ERROR use of possibly uninitialized variable: `x.a`
 }
 
 fn move_after_field_assign_after_uninit() {
@@ -118,8 +103,8 @@ fn move_after_field_assign_after_uninit() {
 }
 
 fn main() {
-    deref_after_move();
-    deref_after_fu_move();
+    use_after_move();
+    use_after_fu_move();
 
     borrow_after_move();
     borrow_after_fu_move();
@@ -132,10 +117,7 @@ fn main() {
     fu_move_after_move();
     fu_move_after_fu_move();
 
-    move_after_borrow_correct();
-    fu_move_after_borrow_correct();
-
-    copy_after_field_assign_after_uninit();
+    use_after_field_assign_after_uninit();
     borrow_after_field_assign_after_uninit();
     move_after_field_assign_after_uninit();
 }

branches/try2/src/test/compile-fail/match-range-fail.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 //error-pattern: lower range bound
-//error-pattern: non-numeric
+//error-pattern: only char and numeric types
 //error-pattern: mismatched types
 
 fn main() {