diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2014-04-21 17:58:52 -0400 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-24 17:18:48 -0700 |
| commit | 9e3d0b002a5c2e81d43351c9b8550a3f4ccfb8f9 (patch) | |
| tree | 1e9a15e8a55cc3947025ab3ac044c2f7977159d9 /src/libserialize | |
| parent | f7f95c8f5a6294f161800dbb65a0423bb5248f34 (diff) | |
| download | rust-9e3d0b002a5c2e81d43351c9b8550a3f4ccfb8f9.tar.gz rust-9e3d0b002a5c2e81d43351c9b8550a3f4ccfb8f9.zip | |
librustc: Remove the fallback to `int` from typechecking.
This breaks a fair amount of code. The typical patterns are:
* `for _ in range(0, 10)`: change to `for _ in range(0u, 10)`;
* `println!("{}", 3)`: change to `println!("{}", 3i)`;
* `[1, 2, 3].len()`: change to `[1i, 2, 3].len()`.
RFC #30. Closes #6023.
[breaking-change]
Diffstat (limited to 'src/libserialize')
| -rw-r--r-- | src/libserialize/base64.rs | 2 | ||||
| -rw-r--r-- | src/libserialize/ebml.rs | 2 | ||||
| -rw-r--r-- | src/libserialize/hex.rs | 4 | ||||
| -rw-r--r-- | src/libserialize/json.rs | 20 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/libserialize/base64.rs b/src/libserialize/base64.rs index 5c4da38989f..ee1e836112e 100644 --- a/src/libserialize/base64.rs +++ b/src/libserialize/base64.rs @@ -336,7 +336,7 @@ mod tests { fn test_base64_random() { use std::rand::{task_rng, random, Rng}; - for _ in range(0, 1000) { + for _ in range(0u, 1000) { let times = task_rng().gen_range(1u, 100); let v = Vec::from_fn(times, |_| random::<u8>()); assert_eq!(v.as_slice() diff --git a/src/libserialize/ebml.rs b/src/libserialize/ebml.rs index 12c5a3493c1..efee29212e9 100644 --- a/src/libserialize/ebml.rs +++ b/src/libserialize/ebml.rs @@ -173,7 +173,7 @@ pub mod reader { // the most significant bit is set, the second most significant bit is set etc. we can // replace up to three "and+branch" with a single table lookup which gives us a measured // speedup of around 2x on x86_64. - static SHIFT_MASK_TABLE: [(u32, u32), ..16] = [ + static SHIFT_MASK_TABLE: [(uint, u32), ..16] = [ (0, 0x0), (0, 0x0fffffff), (8, 0x1fffff), (8, 0x1fffff), (16, 0x3fff), (16, 0x3fff), (16, 0x3fff), (16, 0x3fff), diff --git a/src/libserialize/hex.rs b/src/libserialize/hex.rs index 44d06061853..2fccbc2fcaf 100644 --- a/src/libserialize/hex.rs +++ b/src/libserialize/hex.rs @@ -173,14 +173,14 @@ mod tests { #[test] pub fn test_to_hex_all_bytes() { - for i in range(0, 256) { + for i in range(0u, 256) { assert_eq!([i as u8].to_hex(), format!("{:02x}", i as uint)); } } #[test] pub fn test_from_hex_all_bytes() { - for i in range(0, 256) { + for i in range(0u, 256) { assert_eq!(format!("{:02x}", i as uint).as_slice() .from_hex() .unwrap() diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 0439306ffde..1721bd7ae15 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -3365,21 +3365,21 @@ mod tests { assert_eq!(true.to_json(), Boolean(true)); assert_eq!(false.to_json(), Boolean(false)); assert_eq!("abc".to_string().to_json(), String("abc".to_string())); - assert_eq!((1, 2).to_json(), list2); - assert_eq!((1, 2, 3).to_json(), list3); - assert_eq!([1, 2].to_json(), list2); - assert_eq!((&[1, 2, 3]).to_json(), list3); - assert_eq!((vec![1, 2]).to_json(), list2); - assert_eq!(vec!(1, 2, 3).to_json(), list3); + assert_eq!((1i, 2i).to_json(), list2); + assert_eq!((1i, 2i, 3i).to_json(), list3); + assert_eq!([1i, 2].to_json(), list2); + assert_eq!((&[1i, 2, 3]).to_json(), list3); + assert_eq!((vec![1i, 2]).to_json(), list2); + assert_eq!(vec!(1i, 2i, 3i).to_json(), list3); let mut tree_map = TreeMap::new(); - tree_map.insert("a".to_string(), 1); + tree_map.insert("a".to_string(), 1i); 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(), 1); + hash_map.insert("a".to_string(), 1i); hash_map.insert("b".to_string(), 2); assert_eq!(hash_map.to_json(), object); - assert_eq!(Some(15).to_json(), Number(15 as f64)); + assert_eq!(Some(15i).to_json(), Number(15 as f64)); assert_eq!(None::<int>.to_json(), Null); } @@ -3420,7 +3420,7 @@ mod tests { fn big_json() -> String { let mut src = "[\n".to_string(); - for _ in range(0, 500) { + for _ in range(0i, 500) { src.push_str(r#"{ "a": true, "b": null, "c":3.1415, "d": "Hello world", "e": \ [1,2,3]},"#); } |
