diff options
| author | Nicholas Nethercote <nnethercote@mozilla.com> | 2020-07-30 11:27:50 +1000 |
|---|---|---|
| committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2020-08-08 12:03:42 +1000 |
| commit | e539dd65f8ba80837f7477c0547c61514bceb3ad (patch) | |
| tree | 4d52e0a8cb566c47f9f189b7d11af5095d65eb2d /src/librustc_expand/parse | |
| parent | d6fa011f62ee0c3b256d0be9a69369cbceb3c45b (diff) | |
| download | rust-e539dd65f8ba80837f7477c0547c61514bceb3ad.tar.gz rust-e539dd65f8ba80837f7477c0547c61514bceb3ad.zip | |
Eliminate the `SessionGlobals` from `librustc_ast`.
By moving `{known,used}_attrs` from `SessionGlobals` to `Session`. This
means they are accessed via the `Session`, rather than via TLS. A few
`Attr` methods and `librustc_ast` functions are now methods of
`Session`.
All of this required passing a `Session` to lots of functions that didn't
already have one. Some of these functions also had arguments removed, because
those arguments could be accessed directly via the `Session` argument.
`contains_feature_attr()` was dead, and is removed.
Some functions were moved from `librustc_ast` elsewhere because they now need
to access `Session`, which isn't available in that crate.
- `entry_point_type()` --> `librustc_builtin_macros`
- `global_allocator_spans()` --> `librustc_metadata`
- `is_proc_macro_attr()` --> `Session`
Diffstat (limited to 'src/librustc_expand/parse')
| -rw-r--r-- | src/librustc_expand/parse/lexer/tests.rs | 2 | ||||
| -rw-r--r-- | src/librustc_expand/parse/tests.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_expand/parse/lexer/tests.rs b/src/librustc_expand/parse/lexer/tests.rs index 0b51abf385f..87184444283 100644 --- a/src/librustc_expand/parse/lexer/tests.rs +++ b/src/librustc_expand/parse/lexer/tests.rs @@ -1,12 +1,12 @@ use rustc_ast::ast::AttrStyle; use rustc_ast::token::{self, CommentKind, Token, TokenKind}; -use rustc_ast::with_default_session_globals; use rustc_data_structures::sync::Lrc; use rustc_errors::{emitter::EmitterWriter, Handler}; use rustc_parse::lexer::StringReader; use rustc_session::parse::ParseSess; use rustc_span::source_map::{FilePathMapping, SourceMap}; use rustc_span::symbol::Symbol; +use rustc_span::with_default_session_globals; use rustc_span::{BytePos, Span}; use std::io; diff --git a/src/librustc_expand/parse/tests.rs b/src/librustc_expand/parse/tests.rs index d6301c8a82e..5c9116b2f13 100644 --- a/src/librustc_expand/parse/tests.rs +++ b/src/librustc_expand/parse/tests.rs @@ -5,13 +5,13 @@ use rustc_ast::ptr::P; use rustc_ast::token::{self, Token}; use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree}; use rustc_ast::visit; -use rustc_ast::with_default_session_globals; use rustc_ast_pretty::pprust::item_to_string; use rustc_errors::PResult; use rustc_parse::new_parser_from_source_str; use rustc_session::parse::ParseSess; use rustc_span::source_map::FilePathMapping; use rustc_span::symbol::{kw, sym, Symbol}; +use rustc_span::with_default_session_globals; use rustc_span::{BytePos, FileName, Pos, Span}; use std::path::PathBuf; |
