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/parse/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/parse/tests.rs')
| -rw-r--r-- | src/libsyntax/parse/tests.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/tests.rs b/src/libsyntax/parse/tests.rs index 9edc83a3594..6a789ef99d6 100644 --- a/src/libsyntax/parse/tests.rs +++ b/src/libsyntax/parse/tests.rs @@ -12,7 +12,7 @@ use crate::symbol::{kw, sym}; use crate::tests::{matches_codepattern, string_to_stream, with_error_checking_parse}; use crate::tokenstream::{DelimSpan, TokenTree, TokenStream}; use crate::with_default_globals; -use syntax_pos::{Span, BytePos, Pos, NO_EXPANSION}; +use syntax_pos::{Span, BytePos, Pos}; use std::path::PathBuf; @@ -27,7 +27,7 @@ fn parse_item_from_source_str(name: FileName, source: String, sess: &ParseSess) // produce a syntax_pos::span fn sp(a: u32, b: u32) -> Span { - Span::new(BytePos(a), BytePos(b), NO_EXPANSION) + Span::with_root_ctxt(BytePos(a), BytePos(b)) } /// Parse a string, return an expr |