aboutsummaryrefslogtreecommitdiff
path: root/src/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-08-17 17:23:36 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-08-17 17:23:36 -0700
commite7c7bba846fea549fe4e93de4c9d21e851a9882f (patch)
treea3a2036c12bc821de92c865886c67efc08056e57 /src/lib.rs
parenta4f07b40f547455b3d6bb5a53485a412316d824c (diff)
parent04827b4d07831773175f2c5d7ac267309abc1e16 (diff)
downloadmilf-rs-e7c7bba846fea549fe4e93de4c9d21e851a9882f.tar.gz
milf-rs-e7c7bba846fea549fe4e93de4c9d21e851a9882f.zip
Merge pull request #12 from bkoropoff/build-fix
Fix build break due to import shadowing
Diffstat (limited to 'src/lib.rs')
-rw-r--r--src/lib.rs2
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};