1
Fork 0

serialize: fix fallout

This commit is contained in:
Jorge Aparicio 2015-01-01 22:45:11 -05:00
parent f3333d5e10
commit 6bff9de8ea
2 changed files with 6 additions and 3 deletions

View file

@ -1324,7 +1324,9 @@ pub struct Parser<T> {
state: ParserState, state: ParserState,
} }
impl<T: Iterator<char>> Iterator<JsonEvent> for Parser<T> { impl<T: Iterator<Item=char>> Iterator for Parser<T> {
type Item = JsonEvent;
fn next(&mut self) -> Option<JsonEvent> { fn next(&mut self) -> Option<JsonEvent> {
if self.state == ParseFinished { if self.state == ParseFinished {
return None; return None;
@ -1345,7 +1347,7 @@ impl<T: Iterator<char>> Iterator<JsonEvent> for Parser<T> {
} }
} }
impl<T: Iterator<char>> Parser<T> { impl<T: Iterator<Item=char>> Parser<T> {
/// Creates the JSON parser. /// Creates the JSON parser.
pub fn new(rdr: T) -> Parser<T> { pub fn new(rdr: T) -> Parser<T> {
let mut p = Parser { let mut p = Parser {
@ -1867,7 +1869,7 @@ pub struct Builder<T> {
token: Option<JsonEvent>, token: Option<JsonEvent>,
} }
impl<T: Iterator<char>> Builder<T> { impl<T: Iterator<Item=char>> Builder<T> {
/// Create a JSON Builder. /// Create a JSON Builder.
pub fn new(src: T) -> Builder<T> { pub fn new(src: T) -> Builder<T> {
Builder { parser: Parser::new(src), token: None, } Builder { parser: Parser::new(src), token: None, }

View file

@ -25,6 +25,7 @@ Core encoding and decoding interfaces.
#![allow(unknown_features)] #![allow(unknown_features)]
#![feature(macro_rules, default_type_params, phase, slicing_syntax, globs)] #![feature(macro_rules, default_type_params, phase, slicing_syntax, globs)]
#![feature(unboxed_closures)] #![feature(unboxed_closures)]
#![feature(associated_types)]
// test harness access // test harness access
#[cfg(test)] #[cfg(test)]