Update to rust HEAD

This commit is contained in:
Erick Tryzelaar
2014-06-08 15:09:16 -07:00
parent 02221908a5
commit 485a484ab6
5 changed files with 19 additions and 27 deletions
+3 -3
View File
@@ -1,4 +1,4 @@
use collections::HashMap;
use std::collections::HashMap;
use test::Bencher;
use serialize::{Decoder, Decodable};
@@ -131,7 +131,7 @@ enum Error {
}
mod decoder {
use collections::HashMap;
use std::collections::HashMap;
use serialize::Decoder;
use super::{Outer, Inner, Error, SyntaxError};
@@ -348,7 +348,7 @@ mod decoder {
//////////////////////////////////////////////////////////////////////////////
mod deserializer {
use collections::HashMap;
use std::collections::HashMap;
use super::{Outer, Inner, Error, EndOfStream, SyntaxError};
use de::Deserializer;
use de::{Token, Uint, Char, String, Null, TupleStart, StructStart, Str, SeqStart, MapStart, End, Option};