diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-30 12:14:40 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-30 13:27:02 -0800 |
| commit | 188d7c0bc36e69b99f6bdefd613027e53fa8b2d0 (patch) | |
| tree | 5605bccb8c49ba1baa92cc2132778403d16e58ce /src/libserialize/json.rs | |
| parent | 4c25687c2bf8d83f1e26bd6aad6d2eb807c5b254 (diff) | |
| parent | 7f64fe4e27555c256cb228feb05d4181a2287125 (diff) | |
| download | rust-188d7c0bc36e69b99f6bdefd613027e53fa8b2d0.tar.gz rust-188d7c0bc36e69b99f6bdefd613027e53fa8b2d0.zip | |
rollup merge of #21631: tbu-/isize_police
Conflicts: src/libcoretest/iter.rs
Diffstat (limited to 'src/libserialize/json.rs')
| -rw-r--r-- | src/libserialize/json.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index de7d3829487..8d8bd32ba77 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -3938,7 +3938,7 @@ mod tests { hash_map.insert("a".to_string(), 1u); hash_map.insert("b".to_string(), 2); assert_eq!(hash_map.to_json(), object); - assert_eq!(Some(15i).to_json(), I64(15)); + assert_eq!(Some(15).to_json(), I64(15)); assert_eq!(Some(15u).to_json(), U64(15)); assert_eq!(None::<int>.to_json(), Null); } @@ -3998,7 +3998,7 @@ mod tests { fn big_json() -> string::String { let mut src = "[\n".to_string(); - for _ in 0i..500 { + for _ in 0..500 { src.push_str(r#"{ "a": true, "b": null, "c":3.1415, "d": "Hello world", "e": \ [1,2,3]},"#); } |