Update to latest rust master

This commit is contained in:
Erick Tryzelaar
2014-11-17 19:21:46 -08:00
parent 18d943e8a7
commit ff8c8c77cc
8 changed files with 12 additions and 12 deletions
+3 -3
View File
@@ -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(
+2 -2
View File
@@ -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 {
+1 -1
View File
@@ -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;