diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-04-28 20:13:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-28 20:13:02 +0200 |
| commit | 0cbf3b2b30c3ae5443dbdce8e1b03c0b13fd6929 (patch) | |
| tree | 0d1cdf7f513cdf905818039db967b08fa15cfc89 /compiler/rustc_session/src | |
| parent | cbfbc3be7d1fd5090bdcb1e3c53fa4d894aa99f4 (diff) | |
| parent | 2733ec1be34b1ae9f22c70c901bb89229adf9def (diff) | |
| download | rust-0cbf3b2b30c3ae5443dbdce8e1b03c0b13fd6929.tar.gz rust-0cbf3b2b30c3ae5443dbdce8e1b03c0b13fd6929.zip | |
Rollup merge of #96433 - petrochenkov:delim, r=nnethercote
rustc_ast: Harmonize delimiter naming with `proc_macro::Delimiter` Compiler cannot reuse `proc_macro::Delimiter` directly due to extra impls, but can at least use the same naming. After this PR the only difference between these two enums is that `proc_macro::Delimiter::None` is turned into `token::Delimiter::Invisible`. It's my mistake that the invisible delimiter is called `None` on stable, during the stabilization I audited the naming and wrote the docs, but missed the fact that the `None` naming gives a wrong and confusing impression about what this thing is. cc https://github.com/rust-lang/rust/pull/96421 r? ``@nnethercote``
Diffstat (limited to 'compiler/rustc_session/src')
| -rw-r--r-- | compiler/rustc_session/src/utils.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_session/src/utils.rs b/compiler/rustc_session/src/utils.rs index 8064c217457..db755ccd1d5 100644 --- a/compiler/rustc_session/src/utils.rs +++ b/compiler/rustc_session/src/utils.rs @@ -1,6 +1,6 @@ use crate::parse::ParseSess; use crate::session::Session; -use rustc_ast::token::{self, DelimToken, Nonterminal, Token}; +use rustc_ast::token::{self, Delimiter, Nonterminal, Token}; use rustc_ast::tokenstream::CanSynthesizeMissingTokens; use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree}; use rustc_data_structures::profiling::VerboseTimingGuard; @@ -137,7 +137,7 @@ impl<'a> FlattenNonterminals<'a> { let tts = (self.nt_to_tokenstream)(&nt, self.parse_sess, self.synthesize_tokens); TokenTree::Delimited( DelimSpan::from_single(token.span), - DelimToken::NoDelim, + Delimiter::Invisible, self.process_token_stream(tts), ) .into() |
