Update to latest rust master

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;

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<u8>, 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(

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 {

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;

src/de.rs

@@ -251,7 +251,7 @@ pub trait Deserializer<E>: Iterator<Result<Token, E>> {
     }
 
     #[inline]
-    fn expect_num<T: NumCast>(&mut self, token: Token) -> Result<T, E> {
+    fn expect_num<T: num::NumCast>(&mut self, token: Token) -> Result<T, E> {
         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)),

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<Iter: Iterator<u8>> Parser<Iter> {
             }
         }
 
-        let exp: f64 = num::pow(10u as f64, exp);
+        let exp: f64 = 10_f64.powi(exp as i32);
         if neg_exp {
             res /= exp;
         } else {

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;

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;