mirror of
https://github.com/pezkuwichain/serde.git
synced 2026-04-28 19:37:55 +00:00
Update to latest rust master
This commit is contained in:
@@ -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(
|
||||
|
||||
@@ -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,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;
|
||||
|
||||
Reference in New Issue
Block a user