diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-07-11 04:33:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 04:33:17 +0200 |
| commit | 7697b2927f7eb161412487727a063e228862aa74 (patch) | |
| tree | f7969692747b3f5d5ace9cec97854d9b9363041b /src/libsyntax/source_map.rs | |
| parent | e07df9c9df149b48ef7e035ddaa5ba5a22cb719c (diff) | |
| parent | e86e5cb38ffb9a55f6d9ab6ebda2d384fb154626 (diff) | |
| download | rust-7697b2927f7eb161412487727a063e228862aa74.tar.gz rust-7697b2927f7eb161412487727a063e228862aa74.zip | |
Rollup merge of #62476 - petrochenkov:expref, r=matthewjasper
Continue refactoring macro expansion and resolution This PR continues the work started in https://github.com/rust-lang/rust/pull/62042. It contains a set of more or less related refactorings with the general goal of making things simpler and more orthogonal. Along the way most of the issues uncovered in https://github.com/rust-lang/rust/pull/62086 are fixed. The PR is better read in per-commit fashion with whitespace changes ignored. I tried to leave some more detailed commit messages describing the motivation behind the individual changes. Fixes https://github.com/rust-lang/rust/issues/44692 Fixes https://github.com/rust-lang/rust/issues/52363 Unblocks https://github.com/rust-lang/rust/pull/62086 r? @matthewjasper
Diffstat (limited to 'src/libsyntax/source_map.rs')
| -rw-r--r-- | src/libsyntax/source_map.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs index ac30cbb471a..bbf62ef1e23 100644 --- a/src/libsyntax/source_map.rs +++ b/src/libsyntax/source_map.rs @@ -7,10 +7,8 @@ //! within the SourceMap, which upon request can be converted to line and column //! information, source code snippets, etc. - pub use syntax_pos::*; -pub use syntax_pos::hygiene::{ExpnFormat, ExpnInfo}; -pub use ExpnFormat::*; +pub use syntax_pos::hygiene::{ExpnKind, ExpnInfo}; use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::stable_hasher::StableHasher; |