From 04827b4d07831773175f2c5d7ac267309abc1e16 Mon Sep 17 00:00:00 2001
From: Brian Koropoff <bkoropoff@gmail.com>
Date: Sun, 17 Aug 2014 16:28:44 -0700
Subject: 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.
---
 src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib.rs')

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};
-- 
cgit v1.2.3