Remove the Result<T, Error> type alias.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/builder.rs b/src/builder.rs
index 8cd580e..d4d9364 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -1,14 +1,14 @@
 use std::collections::BTreeMap;
 
 use events::Event;
-use {u64_option_to_usize, Error, Result, Value};
+use {u64_option_to_usize, Error, Value};
 
 pub struct Builder<T> {
     stream: T,
     token: Option<Event>,
 }
 
-impl<T: Iterator<Item = Result<Event>>> Builder<T> {
+impl<T: Iterator<Item = Result<Event, Error>>> Builder<T> {
     pub fn new(stream: T) -> Builder<T> {
         Builder {
             stream: stream,
@@ -16,7 +16,7 @@ impl<T: Iterator<Item = Result<Event>>> Builder<T> {
         }
     }
 
-    pub fn build(mut self) -> Result<Value> {
+    pub fn build(mut self) -> Result<Value, Error> {
         self.bump()?;
 
         let plist = self.build_value()?;
@@ -29,7 +29,7 @@ impl<T: Iterator<Item = Result<Event>>> Builder<T> {
         Ok(plist)
     }
 
-    fn bump(&mut self) -> Result<()> {
+    fn bump(&mut self) -> Result<(), Error> {
         self.token = match self.stream.next() {
             Some(Ok(token)) => Some(token),
             Some(Err(err)) => return Err(err),
@@ -38,7 +38,7 @@ impl<T: Iterator<Item = Result<Event>>> Builder<T> {
         Ok(())
     }
 
-    fn build_value(&mut self) -> Result<Value> {
+    fn build_value(&mut self) -> Result<Value, Error> {
         match self.token.take() {
             Some(Event::StartArray(len)) => Ok(Value::Array(self.build_array(len)?)),
             Some(Event::StartDictionary(len)) => Ok(Value::Dictionary(self.build_dict(len)?)),
@@ -58,7 +58,7 @@ impl<T: Iterator<Item = Result<Event>>> Builder<T> {
         }
     }
 
-    fn build_array(&mut self, len: Option<u64>) -> Result<Vec<Value>> {
+    fn build_array(&mut self, len: Option<u64>) -> Result<Vec<Value>, Error> {
         let len = u64_option_to_usize(len)?;
         let mut values = match len {
             Some(len) => Vec::with_capacity(len),
@@ -75,7 +75,7 @@ impl<T: Iterator<Item = Result<Event>>> Builder<T> {
         }
     }
 
-    fn build_dict(&mut self, _len: Option<u64>) -> Result<BTreeMap<String, Value>> {
+    fn build_dict(&mut self, _len: Option<u64>) -> Result<BTreeMap<String, Value>, Error> {
         let mut values = BTreeMap::new();
 
         loop {