about summary refs log tree commit diff
path: root/src/libsyntax/tokenstream
diff options
context:
space:
mode:
authorArtyom Pavlov <newpavlov@gmail.com>2019-08-17 18:54:56 +0000
committerGitHub <noreply@github.com>2019-08-17 18:54:56 +0000
commit51dcdcfd94450851d64c6d7c4eeab41c3e61f546 (patch)
tree03736fa623009967fb3371d9d51ddc7240037f41 /src/libsyntax/tokenstream
parent7b8273c2e873b814b7c115eabae398d6f11d695b (diff)
parentd65e272a9fe3e61aa5f229c5358e35a909435575 (diff)
downloadrust-51dcdcfd94450851d64c6d7c4eeab41c3e61f546.tar.gz
rust-51dcdcfd94450851d64c6d7c4eeab41c3e61f546.zip
Merge branch 'master' into redox_builder
Diffstat (limited to 'src/libsyntax/tokenstream')
-rw-r--r--src/libsyntax/tokenstream/tests.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/tokenstream/tests.rs b/src/libsyntax/tokenstream/tests.rs
index 72e22a49876..5017e5f5424 100644
--- a/src/libsyntax/tokenstream/tests.rs
+++ b/src/libsyntax/tokenstream/tests.rs
@@ -3,14 +3,14 @@ use super::*;
 use crate::ast::Name;
 use crate::with_default_globals;
 use crate::tests::string_to_stream;
-use syntax_pos::{Span, BytePos, NO_EXPANSION};
+use syntax_pos::{Span, BytePos};
 
 fn string_to_ts(string: &str) -> TokenStream {
     string_to_stream(string.to_owned())
 }
 
 fn sp(a: u32, b: u32) -> Span {
-    Span::new(BytePos(a), BytePos(b), NO_EXPANSION)
+    Span::with_root_ctxt(BytePos(a), BytePos(b))
 }
 
 #[test]