diff --git a/benches/bench_log.rs b/benches/bench_log.rs index 8433be0b..027bc6c5 100644 --- a/benches/bench_log.rs +++ b/benches/bench_log.rs @@ -9,7 +9,7 @@ extern crate serialize; extern crate test; use std::io; -use std::io::{MemWriter, AsRefWriter}; +use std::io::{MemWriter, ByRefWriter}; use test::Bencher; use serde::de; diff --git a/serde2/benches/bench_log.rs b/serde2/benches/bench_log.rs index 16fc6247..8a76320b 100644 --- a/serde2/benches/bench_log.rs +++ b/serde2/benches/bench_log.rs @@ -9,7 +9,7 @@ extern crate serialize; extern crate test; use std::io; -use std::io::{MemWriter, AsRefWriter}; +use std::io::{ByRefWriter, MemWriter}; use test::Bencher; //use serde2::de; @@ -610,10 +610,10 @@ fn push_all_bytes(dst: &mut Vec, src: &[u8]) { let dst_len = dst.len(); let src_len = src.len(); - dst.reserve_additional(src_len); + dst.reserve(src_len); unsafe { - // we would have failed if `reserve_additional` overflowed. + // we would have failed if `reserve` overflowed. dst.set_len(dst_len + src_len); ::std::ptr::copy_nonoverlapping_memory( diff --git a/serde2/src/json/de.rs b/serde2/src/json/de.rs index ba462e03..b82f7cc4 100644 --- a/serde2/src/json/de.rs +++ b/serde2/src/json/de.rs @@ -1,6 +1,6 @@ use std::char; use std::fmt; -use std::num; +use std::num::Float; use std::str::ScalarValue; use std::str; @@ -319,7 +319,7 @@ impl< } } - let exp: f64 = num::pow(10u as f64, exp); + let exp: f64 = 10_f64.powi(exp as i32); if neg_exp { res /= exp; } else { diff --git a/serde2/src/json/ser.rs b/serde2/src/json/ser.rs index 7b3f7fc0..17ad634e 100644 --- a/serde2/src/json/ser.rs +++ b/serde2/src/json/ser.rs @@ -1,7 +1,7 @@ use std::f64; use std::io::{IoError, MemWriter}; use std::io; -use std::num::{FPNaN, FPInfinite}; +use std::num::{Float, FPNaN, FPInfinite}; use ser; use ser::Serializer; diff --git a/src/de.rs b/src/de.rs index d18bf702..1fd7b28b 100644 --- a/src/de.rs +++ b/src/de.rs @@ -251,7 +251,7 @@ pub trait Deserializer: Iterator> { } #[inline] - fn expect_num(&mut self, token: Token) -> Result { + fn expect_num(&mut self, token: Token) -> Result { match token { Int(x) => to_result!(num::cast(x), self.syntax_error(token, PRIMITIVE_TOKEN_KINDS)), I8(x) => to_result!(num::cast(x), self.syntax_error(token, PRIMITIVE_TOKEN_KINDS)), diff --git a/src/json/de.rs b/src/json/de.rs index 73311f51..d98603f9 100644 --- a/src/json/de.rs +++ b/src/json/de.rs @@ -1,5 +1,5 @@ use std::str; -use std::num; +use std::num::Float; use std::str::ScalarValue; use std::char; @@ -286,7 +286,7 @@ impl> Parser { } } - let exp: f64 = num::pow(10u as f64, exp); + let exp: f64 = 10_f64.powi(exp as i32); if neg_exp { res /= exp; } else { diff --git a/src/json/ser.rs b/src/json/ser.rs index f45c77ef..096915f0 100644 --- a/src/json/ser.rs +++ b/src/json/ser.rs @@ -1,6 +1,6 @@ use std::f32; use std::f64; -use std::num::{FPNaN, FPInfinite}; +use std::num::{Float, FPNaN, FPInfinite}; use std::io::{IoError, IoResult, MemWriter}; use ser::Serialize; diff --git a/src/json/value.rs b/src/json/value.rs index c6e0c7c5..5b4e894d 100644 --- a/src/json/value.rs +++ b/src/json/value.rs @@ -1,6 +1,6 @@ use std::collections::{HashMap, TreeMap, tree_map}; use std::fmt; -use std::io::{AsRefWriter, IoResult, MemWriter}; +use std::io::{ByRefWriter, IoResult, MemWriter}; use std::io; use std::str; use std::string;