Rename parser::Error to parser::ParseError

This avoids a conflict with serialization::Error and
actually re-exports it from the crate root as intended.
It also fixes a build break due to the new import
shadowing gate in rustc.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/lib.rs b/src/lib.rs
index d768b7c..e86ef19 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -46,7 +46,7 @@ extern crate serialize;
 use std::collections::TreeMap;
 use std::from_str::FromStr;
 
-pub use parser::{Parser, Error};
+pub use parser::{Parser,ParserError};
 pub use serialization::{Encoder, encode, encode_str};
 pub use serialization::{Decoder, decode, decode_str};
 pub use serialization::{Error, NeedsKey, NoValue};