about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorJonathan Turner <jturner@mozilla.com>2016-06-22 12:50:19 -0400
committerJonathan Turner <jturner@mozilla.com>2016-06-23 08:07:35 -0400
commit51deb4fedbdab4b9b5a7610985c0be54e89cae73 (patch)
tree035dca4977677a80b26843d50cd4aaaadc962573 /src/libsyntax/parse
parent2829fbc63814d02359e3d93d16f7ea7ef748162e (diff)
downloadrust-51deb4fedbdab4b9b5a7610985c0be54e89cae73.tar.gz
rust-51deb4fedbdab4b9b5a7610985c0be54e89cae73.zip
Address more travis errors
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/lexer/mod.rs2
-rw-r--r--src/libsyntax/parse/mod.rs3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index f3d8738e95b..d9d4bb504a7 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -1677,7 +1677,7 @@ fn ident_continue(c: Option<char>) -> bool {
 mod tests {
     use super::*;
 
-    use codemap::{BytePos, Span, NO_EXPANSION};
+    use syntax_pos::{BytePos, Span, NO_EXPANSION};
     use codemap::CodeMap;
     use errors;
     use parse::token;
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 60cc2f659ed..0796f298be1 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -662,7 +662,8 @@ pub fn integer_lit(s: &str,
 mod tests {
     use super::*;
     use std::rc::Rc;
-    use syntax_pos::{Span, BytePos, Pos, Spanned, NO_EXPANSION};
+    use syntax_pos::{Span, BytePos, Pos, NO_EXPANSION};
+    use codemap::Spanned;
     use ast::{self, TokenTree, PatKind};
     use abi::Abi;
     use attr::{first_attr_value_str_by_name, AttrMetaMethods};