diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-29 16:36:42 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-29 16:36:42 -0800 |
| commit | e787fb9d3de1caeceb6f2623052484a5c2b568ca (patch) | |
| tree | 144128cbb204e3d7ce82ca49ab0ec59777502a59 | |
| parent | de0749fc5a9bcaffd37104ecc76c99f2832c0c6a (diff) | |
| parent | 02e03e9d9482f20936dc7eb680a4c96602bd1ae2 (diff) | |
| download | rust-e787fb9d3de1caeceb6f2623052484a5c2b568ca.tar.gz rust-e787fb9d3de1caeceb6f2623052484a5c2b568ca.zip | |
rollup merge of #20279: dgiagio/libserialize_deprecated_fix1
Fixes #20278
| -rw-r--r-- | src/libserialize/json.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index e95f87ccb89..3f0d59c319a 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -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); |
