OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rollup merge of #20279: dgiagio/libserialize_deprecated_fix1 

Fixes #20278
This commit is contained in:
Alex Crichton 2014-12-29 16:36:42 -08:00
parent de0749fc5a 02e03e9d94
commit e787fb9d3d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libserialize/json.rs
View File

@ -2517,7 +2517,7 @@ mod tests {
#[test]
fn test_from_str_trait() {
let s = "null";
assert!(::std::str::from_str::<Json>(s).unwrap() == from_str(s).unwrap());
assert!(s.parse::<Json>().unwrap() == s.parse().unwrap());
}
#[test]
@ -3729,8 +3729,8 @@ mod tests {
let array3 = Array(vec!(U64(1), U64(2), U64(3)));
let object = {
let mut tree_map = BTreeMap::new();
tree_map.insert("a".into_string(), U64(1));
tree_map.insert("b".into_string(), U64(2));
tree_map.insert("a".to_string(), U64(1));
tree_map.insert("b".to_string(), U64(2));
Object(tree_map)
};
@ -3762,8 +3762,8 @@ mod tests {
assert_eq!((vec![1u, 2]).to_json(), array2);
assert_eq!(vec!(1u, 2, 3).to_json(), array3);
let mut tree_map = BTreeMap::new();
tree_map.insert("a".into_string(), 1u);
tree_map.insert("b".into_string(), 2);
tree_map.insert("a".to_string(), 1u);
tree_map.insert("b".to_string(), 2);
assert_eq!(tree_map.to_json(), object);
let mut hash_map = HashMap::new();
hash_map.insert("a".to_string(), 1u);