auto merge of #14524 : ahmedcharles/rust/to_string, r=alexcrichton

This commit is contained in:
bors 2014-05-30 06:01:41 -07:00
commit 874b56d337
3 changed files with 7 additions and 7 deletions

View File

@ -2013,8 +2013,8 @@ mod test_map {
let map_str = format!("{}", map);
assert!(map_str == "{1: 2, 3: 4}".to_owned() || map_str == "{3: 4, 1: 2}".to_owned());
assert_eq!(format!("{}", empty), "{}".to_owned());
assert!(map_str == "{1: 2, 3: 4}".to_string() || map_str == "{3: 4, 1: 2}".to_string());
assert_eq!(format!("{}", empty), "{}".to_string());
}
#[test]

View File

@ -1366,8 +1366,8 @@ mod test_treemap {
let map_str = format!("{}", map);
assert!(map_str == "{1: 2, 3: 4}".to_owned());
assert_eq!(format!("{}", empty), "{}".to_owned());
assert!(map_str == "{1: 2, 3: 4}".to_string());
assert_eq!(format!("{}", empty), "{}".to_string());
}
#[test]
@ -1776,7 +1776,7 @@ mod test_set {
let set_str = format!("{}", set);
assert!(set_str == "{1, 2}".to_owned());
assert_eq!(format!("{}", empty), "{}".to_owned());
assert!(set_str == "{1, 2}".to_string());
assert_eq!(format!("{}", empty), "{}".to_string());
}
}

View File

@ -613,7 +613,7 @@ fn test_repr() {
fn exact_test<T>(t: &T, e:&str) {
let mut m = io::MemWriter::new();
write_repr(&mut m as &mut io::Writer, t).unwrap();
let s = str::from_utf8(m.unwrap().as_slice()).unwrap().to_owned();
let s = str::from_utf8(m.unwrap().as_slice()).unwrap().to_string();
assert_eq!(s.as_slice(), e);
}