diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-16 08:26:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 08:26:36 +0200 |
| commit | 6e9e6ea39bbc2c9e58cdc854c55dfc1487a77ae1 (patch) | |
| tree | 3f954fcac1528b39e95ca78bc3ebad58a30613e0 /src/libsyntax/tokenstream/tests.rs | |
| parent | 32c10056525d427292fdb5e7db7497e2bbe9551b (diff) | |
| parent | c76277340e3e5e8d6aca9c926c45cac3484eb5f8 (diff) | |
| download | rust-6e9e6ea39bbc2c9e58cdc854c55dfc1487a77ae1.tar.gz rust-6e9e6ea39bbc2c9e58cdc854c55dfc1487a77ae1.zip | |
Rollup merge of #63535 - petrochenkov:expndata, r=matthewjasper
Continue refactoring resolve and hygiene The general goal is addressing FIXMEs from the previous PRs. Merging similar data structures (+ prerequisites for such merging), accounting for the fact that all `ExpnId`s have associated data in `HygieneData` now (less `Option`s). Also, some renaming. This should be the last renaming session in this area, I think. r? @matthewjasper
Diffstat (limited to 'src/libsyntax/tokenstream/tests.rs')
| -rw-r--r-- | src/libsyntax/tokenstream/tests.rs | 4 |
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] |