summary refs log tree commit diff
path: root/src/libserialize
diff options
context:
space:
mode:
authorJorge Aparicio <japaricious@gmail.com>2015-01-01 22:45:11 -0500
committerJorge Aparicio <japaricious@gmail.com>2015-01-03 09:34:04 -0500
commit6bff9de8eaa511807e9d6a323d57591b6d2ddcc6 (patch)
tree0e84b9610cd125fdec5be8d6f21c3b71cc3dc392 /src/libserialize
parentf3333d5e1058e6e36c3754ae29ce6c708b35f082 (diff)
downloadrust-6bff9de8eaa511807e9d6a323d57591b6d2ddcc6.tar.gz
rust-6bff9de8eaa511807e9d6a323d57591b6d2ddcc6.zip
serialize: fix fallout
Diffstat (limited to 'src/libserialize')
-rw-r--r--src/libserialize/json.rs8
-rw-r--r--src/libserialize/lib.rs1
2 files changed, 6 insertions, 3 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index a87044bb3b3..83badb0c57c 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -1324,7 +1324,9 @@ pub struct Parser<T> {
     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> {
         if self.state == ParseFinished {
             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.
     pub fn new(rdr: T) -> Parser<T> {
         let mut p = Parser {
@@ -1867,7 +1869,7 @@ pub struct Builder<T> {
     token: Option<JsonEvent>,
 }
 
-impl<T: Iterator<char>> Builder<T> {
+impl<T: Iterator<Item=char>> Builder<T> {
     /// Create a JSON Builder.
     pub fn new(src: T) -> Builder<T> {
         Builder { parser: Parser::new(src), token: None, }
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index 4a2bbbeec03..1ec6a2af309 100644
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -25,6 +25,7 @@ Core encoding and decoding interfaces.
 #![allow(unknown_features)]
 #![feature(macro_rules, default_type_params, phase, slicing_syntax, globs)]
 #![feature(unboxed_closures)]
+#![feature(associated_types)]
 
 // test harness access
 #[cfg(test)]