---

yaml
---
r: 183486
b: refs/heads/beta
c: ba2efe9
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 6cc3b00d3f7b1e7512d85830bf62f2acc461237d
+refs/heads/beta: ba2efe96aeada34c1e2dc267a1a35948bdda91f8
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/src/libcoretest/any.rs

@@ -18,11 +18,11 @@ static TEST: &'static str = "Test";
 
 #[test]
 fn any_referenced() {
-    let (a, b, c) = (&5u as &Any, &TEST as &Any, &Test as &Any);
+    let (a, b, c) = (&5 as &Any, &TEST as &Any, &Test as &Any);
 
-    assert!(a.is::<uint>());
-    assert!(!b.is::<uint>());
-    assert!(!c.is::<uint>());
+    assert!(a.is::<i32>());
+    assert!(!b.is::<i32>());
+    assert!(!c.is::<i32>());
 
     assert!(!a.is::<&'static str>());
     assert!(b.is::<&'static str>());
@@ -35,7 +35,7 @@ fn any_referenced() {
 
 #[test]
 fn any_owning() {
-    let (a, b, c) = (box 5u as Box<Any>, box TEST as Box<Any>, box Test as Box<Any>);
+    let (a, b, c) = (box 5us as Box<Any>, box TEST as Box<Any>, box Test as Box<Any>);
 
     assert!(a.is::<uint>());
     assert!(!b.is::<uint>());
@@ -52,7 +52,7 @@ fn any_owning() {
 
 #[test]
 fn any_downcast_ref() {
-    let a = &5u as &Any;
+    let a = &5us as &Any;
 
     match a.downcast_ref::<uint>() {
         Some(&5) => {}
@@ -67,24 +67,24 @@ fn any_downcast_ref() {
 
 #[test]
 fn any_downcast_mut() {
-    let mut a = 5u;
-    let mut b = box 7u;
+    let mut a = 5us;
+    let mut b = box 7us;
 
     let a_r = &mut a as &mut Any;
     let tmp: &mut uint = &mut *b;
     let b_r = tmp as &mut Any;
 
     match a_r.downcast_mut::<uint>() {
         Some(x) => {
-            assert_eq!(*x, 5u);
+            assert_eq!(*x, 5);
             *x = 612;
         }
         x => panic!("Unexpected value {:?}", x)
     }
 
     match b_r.downcast_mut::<uint>() {
         Some(x) => {
-            assert_eq!(*x, 7u);
+            assert_eq!(*x, 7);
             *x = 413;
         }
         x => panic!("Unexpected value {:?}", x)
@@ -113,7 +113,7 @@ fn any_downcast_mut() {
 
 #[test]
 fn any_fixed_vec() {
-    let test = [0u; 8];
+    let test = [0us; 8];
     let test = &test as &Any;
     assert!(test.is::<[uint; 8]>());
     assert!(!test.is::<[uint; 10]>());

branches/beta/src/libcoretest/cell.rs

@@ -134,21 +134,21 @@ fn clone_ref_updates_flag() {
 
 #[test]
 fn as_unsafe_cell() {
-    let c1: Cell<uint> = Cell::new(0u);
-    c1.set(1u);
-    assert_eq!(1u, unsafe { *c1.as_unsafe_cell().get() });
+    let c1: Cell<uint> = Cell::new(0);
+    c1.set(1);
+    assert_eq!(1, unsafe { *c1.as_unsafe_cell().get() });
 
-    let c2: Cell<uint> = Cell::new(0u);
-    unsafe { *c2.as_unsafe_cell().get() = 1u; }
-    assert_eq!(1u, c2.get());
+    let c2: Cell<uint> = Cell::new(0);
+    unsafe { *c2.as_unsafe_cell().get() = 1; }
+    assert_eq!(1, c2.get());
 
-    let r1: RefCell<uint> = RefCell::new(0u);
-    *r1.borrow_mut() = 1u;
-    assert_eq!(1u, unsafe { *r1.as_unsafe_cell().get() });
+    let r1: RefCell<uint> = RefCell::new(0);
+    *r1.borrow_mut() = 1;
+    assert_eq!(1, unsafe { *r1.as_unsafe_cell().get() });
 
-    let r2: RefCell<uint> = RefCell::new(0u);
-    unsafe { *r2.as_unsafe_cell().get() = 1u; }
-    assert_eq!(1u, *r2.borrow());
+    let r2: RefCell<uint> = RefCell::new(0);
+    unsafe { *r2.as_unsafe_cell().get() = 1; }
+    assert_eq!(1, *r2.borrow());
 }
 
 #[test]

branches/beta/src/libcoretest/char.rs

@@ -41,18 +41,18 @@ fn test_is_whitespace() {
 
 #[test]
 fn test_to_digit() {
-    assert_eq!('0'.to_digit(10u), Some(0u));
-    assert_eq!('1'.to_digit(2u), Some(1u));
-    assert_eq!('2'.to_digit(3u), Some(2u));
-    assert_eq!('9'.to_digit(10u), Some(9u));
-    assert_eq!('a'.to_digit(16u), Some(10u));
-    assert_eq!('A'.to_digit(16u), Some(10u));
-    assert_eq!('b'.to_digit(16u), Some(11u));
-    assert_eq!('B'.to_digit(16u), Some(11u));
-    assert_eq!('z'.to_digit(36u), Some(35u));
-    assert_eq!('Z'.to_digit(36u), Some(35u));
-    assert_eq!(' '.to_digit(10u), None);
-    assert_eq!('$'.to_digit(36u), None);
+    assert_eq!('0'.to_digit(10), Some(0));
+    assert_eq!('1'.to_digit(2), Some(1));
+    assert_eq!('2'.to_digit(3), Some(2));
+    assert_eq!('9'.to_digit(10), Some(9));
+    assert_eq!('a'.to_digit(16), Some(10));
+    assert_eq!('A'.to_digit(16), Some(10));
+    assert_eq!('b'.to_digit(16), Some(11));
+    assert_eq!('B'.to_digit(16), Some(11));
+    assert_eq!('z'.to_digit(36), Some(35));
+    assert_eq!('Z'.to_digit(36), Some(35));
+    assert_eq!(' '.to_digit(10), None);
+    assert_eq!('$'.to_digit(36), None);
 }
 
 #[test]