---

Jorge Aparicio · Jorge Aparicio · commit 3bc19fc39e8a · 2014-12-06T23:53:02.000-05:00
yaml --- r: 162268 b: refs/heads/auto c: 98ae637 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 976660f3f73a2dba68695fce1b697f7694af0a23
+refs/heads/auto: 98ae63753bc6c2efe1c8ed50d45e665db686cde7
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/libcollections/bit.rs b/branches/auto/src/libcollections/bit.rs
@@ -2660,7 +2660,7 @@ mod tests {
         s.insert(10);
         s.insert(50);
         s.insert(2);
-        assert_eq!("{1, 2, 10, 50}".to_string(), s.to_string());
+        assert_eq!("{1, 2, 10, 50}", s.to_string());
     }
 
     fn rng() -> rand::IsaacRng {
diff --git a/branches/auto/src/libcollections/btree/set.rs b/branches/auto/src/libcollections/btree/set.rs
@@ -580,7 +580,7 @@ mod test {
 
         let set_str = format!("{}", set);
 
-        assert!(set_str == "{1, 2}".to_string());
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert!(set_str == "{1, 2}");
+        assert_eq!(format!("{}", empty), "{}");
     }
 }
diff --git a/branches/auto/src/libcollections/slice.rs b/branches/auto/src/libcollections/slice.rs
@@ -1838,20 +1838,20 @@ mod tests {
             })
         )
         let empty: Vec<int> = vec![];
-        test_show_vec!(empty, "[]".to_string());
-        test_show_vec!(vec![1i], "[1]".to_string());
-        test_show_vec!(vec![1i, 2, 3], "[1, 2, 3]".to_string());
+        test_show_vec!(empty, "[]");
+        test_show_vec!(vec![1i], "[1]");
+        test_show_vec!(vec![1i, 2, 3], "[1, 2, 3]");
         test_show_vec!(vec![vec![], vec![1u], vec![1u, 1u]],
-                       "[[], [1], [1, 1]]".to_string());
+                       "[[], [1], [1, 1]]");
 
         let empty_mut: &mut [int] = &mut[];
-        test_show_vec!(empty_mut, "[]".to_string());
+        test_show_vec!(empty_mut, "[]");
         let v: &mut[int] = &mut[1];
-        test_show_vec!(v, "[1]".to_string());
+        test_show_vec!(v, "[1]");
         let v: &mut[int] = &mut[1, 2, 3];
-        test_show_vec!(v, "[1, 2, 3]".to_string());
+        test_show_vec!(v, "[1, 2, 3]");
         let v: &mut [&mut[uint]] = &mut[&mut[], &mut[1u], &mut[1u, 1u]];
-        test_show_vec!(v, "[[], [1], [1, 1]]".to_string());
+        test_show_vec!(v, "[[], [1], [1, 1]]");
     }
 
     #[test]
diff --git a/branches/auto/src/libcollections/str.rs b/branches/auto/src/libcollections/str.rs
@@ -1831,7 +1831,7 @@ mod tests {
     fn test_nfd_chars() {
         macro_rules! t {
             ($input: expr, $expected: expr) => {
-                assert_eq!($input.nfd_chars().collect::<String>(), $expected.into_string());
+                assert_eq!($input.nfd_chars().collect::<String>(), $expected);
             }
         }
         t!("abc", "abc");
@@ -1850,7 +1850,7 @@ mod tests {
     fn test_nfkd_chars() {
         macro_rules! t {
             ($input: expr, $expected: expr) => {
-                assert_eq!($input.nfkd_chars().collect::<String>(), $expected.into_string());
+                assert_eq!($input.nfkd_chars().collect::<String>(), $expected);
             }
         }
         t!("abc", "abc");
@@ -1869,7 +1869,7 @@ mod tests {
     fn test_nfc_chars() {
         macro_rules! t {
             ($input: expr, $expected: expr) => {
-                assert_eq!($input.nfc_chars().collect::<String>(), $expected.into_string());
+                assert_eq!($input.nfc_chars().collect::<String>(), $expected);
             }
         }
         t!("abc", "abc");
@@ -1889,7 +1889,7 @@ mod tests {
     fn test_nfkc_chars() {
         macro_rules! t {
             ($input: expr, $expected: expr) => {
-                assert_eq!($input.nfkc_chars().collect::<String>(), $expected.into_string());
+                assert_eq!($input.nfkc_chars().collect::<String>(), $expected);
             }
         }
         t!("abc", "abc");
diff --git a/branches/auto/src/libcollections/string.rs b/branches/auto/src/libcollections/string.rs
@@ -1287,24 +1287,24 @@ mod tests {
 
     #[test]
     fn test_simple_types() {
-        assert_eq!(1i.to_string(), "1".to_string());
-        assert_eq!((-1i).to_string(), "-1".to_string());
-        assert_eq!(200u.to_string(), "200".to_string());
-        assert_eq!(2u8.to_string(), "2".to_string());
-        assert_eq!(true.to_string(), "true".to_string());
-        assert_eq!(false.to_string(), "false".to_string());
-        assert_eq!(().to_string(), "()".to_string());
-        assert_eq!(("hi".to_string()).to_string(), "hi".to_string());
+        assert_eq!(1i.to_string(), "1");
+        assert_eq!((-1i).to_string(), "-1");
+        assert_eq!(200u.to_string(), "200");
+        assert_eq!(2u8.to_string(), "2");
+        assert_eq!(true.to_string(), "true");
+        assert_eq!(false.to_string(), "false");
+        assert_eq!(().to_string(), "()");
+        assert_eq!(("hi".to_string()).to_string(), "hi");
     }
 
     #[test]
     fn test_vectors() {
         let x: Vec<int> = vec![];
-        assert_eq!(x.to_string(), "[]".to_string());
-        assert_eq!((vec![1i]).to_string(), "[1]".to_string());
-        assert_eq!((vec![1i, 2, 3]).to_string(), "[1, 2, 3]".to_string());
+        assert_eq!(x.to_string(), "[]");
+        assert_eq!((vec![1i]).to_string(), "[1]");
+        assert_eq!((vec![1i, 2, 3]).to_string(), "[1, 2, 3]");
         assert!((vec![vec![], vec![1i], vec![1i, 1]]).to_string() ==
-               "[[], [1], [1, 1]]".to_string());
+               "[[], [1], [1, 1]]");
     }
 
     #[bench]
diff --git a/branches/auto/src/libcollections/tree/map.rs b/branches/auto/src/libcollections/tree/map.rs
@@ -1735,8 +1735,8 @@ mod test_treemap {
 
         let map_str = format!("{}", map);
 
-        assert!(map_str == "{1: 2, 3: 4}".to_string());
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert!(map_str == "{1: 2, 3: 4}");
+        assert_eq!(format!("{}", empty), "{}");
     }
 
     #[test]
diff --git a/branches/auto/src/libcollections/tree/set.rs b/branches/auto/src/libcollections/tree/set.rs
@@ -979,7 +979,7 @@ mod test {
 
         let set_str = format!("{}", set);
 
-        assert!(set_str == "{1, 2}".to_string());
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert!(set_str == "{1, 2}");
+        assert_eq!(format!("{}", empty), "{}");
     }
 }
diff --git a/branches/auto/src/libcollections/trie/map.rs b/branches/auto/src/libcollections/trie/map.rs
@@ -1605,8 +1605,8 @@ mod test {
 
         let map_str = format!("{}", map);
 
-        assert!(map_str == "{1: a, 2: b}".to_string());
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert!(map_str == "{1: a, 2: b}");
+        assert_eq!(format!("{}", empty), "{}");
     }
 
     #[test]
diff --git a/branches/auto/src/libcollections/trie/set.rs b/branches/auto/src/libcollections/trie/set.rs
@@ -696,8 +696,8 @@ mod test {
 
         let set_str = format!("{}", set);
 
-        assert!(set_str == "{1, 2}".to_string());
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert!(set_str == "{1, 2}");
+        assert_eq!(format!("{}", empty), "{}");
     }
 
     #[test]
diff --git a/branches/auto/src/libcollections/vec_map.rs b/branches/auto/src/libcollections/vec_map.rs
@@ -871,7 +871,7 @@ mod test_map {
 
         let map_str = map.to_string();
         assert!(map_str == "{1: 2, 3: 4}" || map_str == "{3: 4, 1: 2}");
-        assert_eq!(format!("{}", empty), "{}".to_string());
+        assert_eq!(format!("{}", empty), "{}");
     }
 
     #[test]

Original file line number	Diff line number	Diff line change
`@@ -2660,7 +2660,7 @@ mod tests {`
`2660`	`2660`	`s.insert(10);`
`2661`	`2661`	`s.insert(50);`
`2662`	`2662`	`s.insert(2);`
`2663`		`- assert_eq!("{1, 2, 10, 50}".to_string(), s.to_string());`
	`2663`	`+ assert_eq!("{1, 2, 10, 50}", s.to_string());`
`2664`	`2664`	`}`
`2665`	`2665`
`2666`	`2666`	`fn rng() -> rand::IsaacRng {`
Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,7 @@ mod test {`
`580`	`580`
`581`	`581`	`let set_str = format!("{}", set);`
`582`	`582`
`583`		`- assert!(set_str == "{1, 2}".to_string());`
`584`		`- assert_eq!(format!("{}", empty), "{}".to_string());`
	`583`	`+ assert!(set_str == "{1, 2}");`
	`584`	`+ assert_eq!(format!("{}", empty), "{}");`
`585`	`585`	`}`
`586`	`586`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1831,7 +1831,7 @@ mod tests {`
`1831`	`1831`	`fn test_nfd_chars() {`
`1832`	`1832`	`macro_rules! t {`
`1833`	`1833`	`($input: expr, $expected: expr) => {`
`1834`		`- assert_eq!($input.nfd_chars().collect::<String>(), $expected.into_string());`
	`1834`	`+ assert_eq!($input.nfd_chars().collect::<String>(), $expected);`
`1835`	`1835`	`}`
`1836`	`1836`	`}`
`1837`	`1837`	`t!("abc", "abc");`
`@@ -1850,7 +1850,7 @@ mod tests {`
`1850`	`1850`	`fn test_nfkd_chars() {`
`1851`	`1851`	`macro_rules! t {`
`1852`	`1852`	`($input: expr, $expected: expr) => {`
`1853`		`- assert_eq!($input.nfkd_chars().collect::<String>(), $expected.into_string());`
	`1853`	`+ assert_eq!($input.nfkd_chars().collect::<String>(), $expected);`
`1854`	`1854`	`}`
`1855`	`1855`	`}`
`1856`	`1856`	`t!("abc", "abc");`
`@@ -1869,7 +1869,7 @@ mod tests {`
`1869`	`1869`	`fn test_nfc_chars() {`
`1870`	`1870`	`macro_rules! t {`
`1871`	`1871`	`($input: expr, $expected: expr) => {`
`1872`		`- assert_eq!($input.nfc_chars().collect::<String>(), $expected.into_string());`
	`1872`	`+ assert_eq!($input.nfc_chars().collect::<String>(), $expected);`
`1873`	`1873`	`}`
`1874`	`1874`	`}`
`1875`	`1875`	`t!("abc", "abc");`
`@@ -1889,7 +1889,7 @@ mod tests {`
`1889`	`1889`	`fn test_nfkc_chars() {`
`1890`	`1890`	`macro_rules! t {`
`1891`	`1891`	`($input: expr, $expected: expr) => {`
`1892`		`- assert_eq!($input.nfkc_chars().collect::<String>(), $expected.into_string());`
	`1892`	`+ assert_eq!($input.nfkc_chars().collect::<String>(), $expected);`
`1893`	`1893`	`}`
`1894`	`1894`	`}`
`1895`	`1895`	`t!("abc", "abc");`
Original file line number	Diff line number	Diff line change
`@@ -1735,8 +1735,8 @@ mod test_treemap {`
`1735`	`1735`
`1736`	`1736`	`let map_str = format!("{}", map);`
`1737`	`1737`
`1738`		`- assert!(map_str == "{1: 2, 3: 4}".to_string());`
`1739`		`- assert_eq!(format!("{}", empty), "{}".to_string());`
	`1738`	`+ assert!(map_str == "{1: 2, 3: 4}");`
	`1739`	`+ assert_eq!(format!("{}", empty), "{}");`
`1740`	`1740`	`}`
`1741`	`1741`
`1742`	`1742`	`#[test]`
Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,7 @@ mod test {`
`979`	`979`
`980`	`980`	`let set_str = format!("{}", set);`
`981`	`981`
`982`		`- assert!(set_str == "{1, 2}".to_string());`
`983`		`- assert_eq!(format!("{}", empty), "{}".to_string());`
	`982`	`+ assert!(set_str == "{1, 2}");`
	`983`	`+ assert_eq!(format!("{}", empty), "{}");`
`984`	`984`	`}`
`985`	`985`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1605,8 +1605,8 @@ mod test {`
`1605`	`1605`
`1606`	`1606`	`let map_str = format!("{}", map);`
`1607`	`1607`
`1608`		`- assert!(map_str == "{1: a, 2: b}".to_string());`
`1609`		`- assert_eq!(format!("{}", empty), "{}".to_string());`
	`1608`	`+ assert!(map_str == "{1: a, 2: b}");`
	`1609`	`+ assert_eq!(format!("{}", empty), "{}");`
`1610`	`1610`	`}`
`1611`	`1611`
`1612`	`1612`	`#[test]`
Original file line number	Diff line number	Diff line change
`@@ -696,8 +696,8 @@ mod test {`
`696`	`696`
`697`	`697`	`let set_str = format!("{}", set);`
`698`	`698`
`699`		`- assert!(set_str == "{1, 2}".to_string());`
`700`		`- assert_eq!(format!("{}", empty), "{}".to_string());`
	`699`	`+ assert!(set_str == "{1, 2}");`
	`700`	`+ assert_eq!(format!("{}", empty), "{}");`
`701`	`701`	`}`
`702`	`702`
`703`	`703`	`#[test]`
Original file line number	Diff line number	Diff line change
`@@ -871,7 +871,7 @@ mod test_map {`
`871`	`871`
`872`	`872`	`let map_str = map.to_string();`
`873`	`873`	`assert!(map_str == "{1: 2, 3: 4}" \|\| map_str == "{3: 4, 1: 2}");`
`874`		`- assert_eq!(format!("{}", empty), "{}".to_string());`
	`874`	`+ assert_eq!(format!("{}", empty), "{}");`
`875`	`875`	`}`
`876`	`876`
`877`	`877`	`#[test]`