summary refs log tree commit diff
path: root/src/libsyntax/parse/lexer.rs
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2013-03-01 07:01:48 -0800
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2013-03-01 07:01:48 -0800
commit85fecd0ba77066e604cec9d3866b76edc626b5d3 (patch)
treea375b9e61af4c5e105b58271c9381fdaf58d31b0 /src/libsyntax/parse/lexer.rs
parentd2c4b6492dbccc1bb60f163ac583467bc63abce6 (diff)
parenta660bb362ce5a39014fb274367e6361d4deb8a7d (diff)
downloadrust-85fecd0ba77066e604cec9d3866b76edc626b5d3.tar.gz
rust-85fecd0ba77066e604cec9d3866b76edc626b5d3.zip
Merge remote-tracking branch 'remotes/origin/incoming' into incoming
Diffstat (limited to 'src/libsyntax/parse/lexer.rs')
-rw-r--r--src/libsyntax/parse/lexer.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index 2a40b700c11..ed71fa411c6 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/src/libsyntax/parse/lexer.rs
@@ -773,10 +773,14 @@ fn consume_whitespace(rdr: @mut StringReader) {
 
 #[cfg(test)]
 pub mod test {
-
     use super::*;
-    use util::interner;
+
+    use ast;
+    use codemap::{BytePos, CodeMap, span};
+    use core::option::None;
     use diagnostic;
+    use parse::token;
+    use util::interner;
     use util::testing::{check_equal, check_equal_ptr};
 
     // represents a testing reader (incl. both reader and interner)