rollup merge of #21631: tbu-/isize_police

Conflicts:
	src/libcoretest/iter.rs

2 files changed, 3 insertions, 3 deletions

diff --git a/src/libserialize/hex.rs b/src/libserialize/hex.rs
index d3c2ffa9544..c9b6af26ce0 100644
--- a/src/libserialize/hex.rs
+++ b/src/libserialize/hex.rs
@@ -116,7 +116,7 @@ impl FromHex for str {
     fn from_hex(&self) -> Result<Vec<u8>, FromHexError> {
         // This may be an overestimate if there is any whitespace
         let mut b = Vec::with_capacity(self.len() / 2);
-        let mut modulus = 0i;
+        let mut modulus = 0;
         let mut buf = 0u8;
 
         for (idx, byte) in self.bytes().enumerate() {
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]},"#);
         }