From a62d516de92a504d876f10800ba36e3a16d541ce Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Fri, 27 Jun 2014 08:07:03 -0700 Subject: [PATCH] Update to rust HEAD --- bench_map.rs | 8 ++++---- bench_vec.rs | 4 ++-- de.rs | 2 +- json.rs | 40 ++++++++++++++++++++-------------------- ser.rs | 14 +++++++------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/bench_map.rs b/bench_map.rs index 689f7ea9..9e48b771 100644 --- a/bench_map.rs +++ b/bench_map.rs @@ -257,7 +257,7 @@ fn bench_decoder_000(b: &mut Bencher) { fn bench_decoder_003(b: &mut Bencher) { b.iter(|| { let mut m: HashMap = HashMap::new(); - for i in range(0, 3) { + for i in range(0i, 3) { m.insert(i.to_str(), i); } run_decoder(decoder::IntDecoder::new(m.clone()), m) @@ -268,7 +268,7 @@ fn bench_decoder_003(b: &mut Bencher) { fn bench_decoder_100(b: &mut Bencher) { b.iter(|| { let mut m: HashMap = HashMap::new(); - for i in range(0, 100) { + for i in range(0i, 100) { m.insert(i.to_str(), i); } run_decoder(decoder::IntDecoder::new(m.clone()), m) @@ -297,7 +297,7 @@ fn bench_deserializer_000(b: &mut Bencher) { fn bench_deserializer_003(b: &mut Bencher) { b.iter(|| { let mut m: HashMap = HashMap::new(); - for i in range(0, 3) { + for i in range(0i, 3) { m.insert(i.to_str(), i); } run_deserializer(deserializer::IntDeserializer::new(m.clone()), m) @@ -308,7 +308,7 @@ fn bench_deserializer_003(b: &mut Bencher) { fn bench_deserializer_100(b: &mut Bencher) { b.iter(|| { let mut m: HashMap = HashMap::new(); - for i in range(0, 100) { + for i in range(0i, 100) { m.insert(i.to_str(), i); } run_deserializer(deserializer::IntDeserializer::new(m.clone()), m) diff --git a/bench_vec.rs b/bench_vec.rs index 09736a01..bcf71fd9 100644 --- a/bench_vec.rs +++ b/bench_vec.rs @@ -393,7 +393,7 @@ fn bench_decoder_int_003(b: &mut Bencher) { #[bench] fn bench_decoder_int_100(b: &mut Bencher) { b.iter(|| { - let v: Vec = range(0, 100).collect(); + let v: Vec = range(0i, 100).collect(); run_decoder(decoder::IntDecoder::new(v.clone()), v) }) } @@ -441,7 +441,7 @@ fn bench_deserializer_int_003(b: &mut Bencher) { #[bench] fn bench_deserializer_int_100(b: &mut Bencher) { b.iter(|| { - let v: Vec = range(0, 100).collect(); + let v: Vec = range(0i, 100).collect(); run_deserializer(deserializer::IntDeserializer::new(v.clone()), v) }) } diff --git a/de.rs b/de.rs index 16b71e3b..59868c0c 100644 --- a/de.rs +++ b/de.rs @@ -1089,6 +1089,6 @@ mod tests { Int(6), String("b".to_string()), End, - ) => treemap!(5 => "a".to_string(), 6 => "b".to_string()): TreeMap + ) => treemap!(5i => "a".to_string(), 6i => "b".to_string()): TreeMap ]) } diff --git a/json.rs b/json.rs index 5b593fa4..aa124b60 100644 --- a/json.rs +++ b/json.rs @@ -2519,7 +2519,7 @@ mod tests { #[test] fn test_write_number() { let tests = [ - (3.0, "3"), + (3.0f64, "3"), (3.1, "3.1"), (-1.5, "-1.5"), (0.5, "0.5"), @@ -2687,14 +2687,14 @@ mod tests { fn test_write_tuple() { test_encode_ok([ ( - (5,), + (5i,), "[5]", ), ]); test_pretty_encode_ok([ ( - (5,), + (5i,), concat!( "[\n", " 5\n", @@ -2705,14 +2705,14 @@ mod tests { test_encode_ok([ ( - (5, (6, "abc")), + (5i, (6i, "abc")), "[5,[6,\"abc\"]]", ), ]); test_pretty_encode_ok([ ( - (5, (6, "abc")), + (5i, (6i, "abc")), concat!( "[\n", " 5,\n", @@ -2911,7 +2911,7 @@ mod tests { ]); test_parse_ok([ - ("3", 3.0), + ("3", 3.0f64), ("3.1", 3.1), ("-1.2", -1.2), ("0.4", 0.4), @@ -2924,7 +2924,7 @@ mod tests { #[test] fn test_json_deserialize_numbers() { test_json_deserialize_ok([ - 3.0, + 3.0f64, 3.1, -1.2, 0.4, @@ -2994,12 +2994,12 @@ mod tests { ]); test_parse_ok([ - ("[3,1]", vec!(3, 1)), - ("[ 3 , 1 ]", vec!(3, 1)), + ("[3,1]", vec!(3i, 1)), + ("[ 3 , 1 ]", vec!(3i, 1)), ]); test_parse_ok([ - ("[[3], [1, 2]]", vec!(vec!(3), vec!(1, 2))), + ("[[3], [1, 2]]", vec!(vec!(3i), vec!(1, 2))), ]); } @@ -3015,11 +3015,11 @@ mod tests { ]); test_json_deserialize_ok([ - vec!(3, 1), + vec!(3i, 1), ]); test_json_deserialize_ok([ - vec!(vec!(3), vec!(1, 2)), + vec!(vec!(3i), vec!(1, 2)), ]); } @@ -3045,26 +3045,26 @@ mod tests { ("{ }", treemap!()), ( "{\"a\":3}", - treemap!("a".to_string() => 3) + treemap!("a".to_string() => 3i) ), ( "{ \"a\" : 3 }", - treemap!("a".to_string() => 3) + treemap!("a".to_string() => 3i) ), ( "{\"a\":3,\"b\":4}", - treemap!("a".to_string() => 3, "b".to_string() => 4) + treemap!("a".to_string() => 3i, "b".to_string() => 4) ), ( "{ \"a\" : 3 , \"b\" : 4 }", - treemap!("a".to_string() => 3, "b".to_string() => 4), + treemap!("a".to_string() => 3i, "b".to_string() => 4), ), ]); test_parse_ok([ ( "{\"a\": {\"b\": 3, \"c\": 4}}", - treemap!("a".to_string() => treemap!("b".to_string() => 3, "c".to_string() => 4)), + treemap!("a".to_string() => treemap!("b".to_string() => 3i, "c".to_string() => 4i)), ), ]); } @@ -3073,12 +3073,12 @@ mod tests { fn test_json_deserialize_object() { test_json_deserialize_ok([ treemap!(), - treemap!("a".to_string() => 3), - treemap!("a".to_string() => 3, "b".to_string() => 4), + treemap!("a".to_string() => 3i), + treemap!("a".to_string() => 3i, "b".to_string() => 4), ]); test_json_deserialize_ok([ - treemap!("a".to_string() => treemap!("b".to_string() => 3, "c".to_string() => 4)), + treemap!("a".to_string() => treemap!("b".to_string() => 3i, "c".to_string() => 4)), ]); } diff --git a/ser.rs b/ser.rs index 03da1f98..659127a7 100644 --- a/ser.rs +++ b/ser.rs @@ -619,7 +619,7 @@ mod tests { ); let mut serializer = AssertSerializer::new(tokens.move_iter()); - Some(5).serialize(&mut serializer).unwrap(); + Some(5i).serialize(&mut serializer).unwrap(); assert_eq!(serializer.iter.next(), None); } @@ -636,7 +636,7 @@ mod tests { ); let mut serializer = AssertSerializer::new(tokens.move_iter()); - (5, "a").serialize(&mut serializer).unwrap(); + (5i, "a").serialize(&mut serializer).unwrap(); assert_eq!(serializer.iter.next(), None); } @@ -662,7 +662,7 @@ mod tests { ); let mut serializer = AssertSerializer::new(tokens.move_iter()); - ((), (), (5, "a")).serialize(&mut serializer).unwrap(); + ((), (), (5i, "a")).serialize(&mut serializer).unwrap(); assert_eq!(serializer.iter.next(), None); } @@ -772,7 +772,7 @@ mod tests { ); let mut serializer = AssertSerializer::new(tokens.move_iter()); - (vec!(5, 6, 7)).serialize(&mut serializer).unwrap(); + (vec!(5i, 6, 7)).serialize(&mut serializer).unwrap(); assert_eq!(serializer.iter.next(), None); } @@ -798,7 +798,7 @@ mod tests { ); let mut serializer = AssertSerializer::new(tokens.move_iter()); - (vec!(vec!(1), vec!(2, 3), vec!(4, 5, 6))).serialize(&mut serializer).unwrap(); + (vec!(vec!(1i), vec!(2, 3), vec!(4, 5, 6))).serialize(&mut serializer).unwrap(); assert_eq!(serializer.iter.next(), None); } @@ -817,8 +817,8 @@ mod tests { let mut serializer = AssertSerializer::new(tokens.move_iter()); let mut map = TreeMap::new(); - map.insert(5, "a".to_string()); - map.insert(6, "b".to_string()); + map.insert(5i, "a".to_string()); + map.insert(6i, "b".to_string()); map.serialize(&mut serializer).unwrap(); assert_eq!(serializer.iter.next(), None);