commit ad4b247cf01af3c93dae0bc87b13e78f0cdeeccb
author David Tolnay <dtolnay@gmail.com> Sat Aug 25 08:25:24 2018 -0400
committer David Tolnay <dtolnay@gmail.com> Sat Aug 25 08:26:05 2018 -0400
tree 0d8da3b93f06b284a5b7917ba59bb63e3eee46ea
parent 456c982ee242712747026a519ec713e8bfc8507b

Unify the error modules

src/token.rs

diff --git a/src/token.rs b/src/token.rs
index 90f20f9..7b1e320 100644
--- a/src/token.rs
+++ b/src/token.rs
@@ -114,9 +114,11 @@
 use quote::{ToTokens, TokenStreamExt};
 
 #[cfg(feature = "parsing")]
+use error::Result;
+#[cfg(feature = "parsing")]
 use next::lookahead;
 #[cfg(feature = "parsing")]
-use next::parse::{Lookahead1, Parse, ParseStream, Result};
+use next::parse::{Lookahead1, Parse, ParseStream};
 use span::IntoSpans;
 
 /// Marker trait for types that represent single tokens.
@@ -772,7 +774,8 @@
     use proc_macro2::{Delimiter, Spacing, Span};
 
     use buffer::Cursor;
-    use next::parse::{Error, ParseStream, Result};
+    use error::{Error, Result};
+    use next::parse::ParseStream;
     use parse_error;
     use span::FromSpans;
     use synom::PResult;