diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2023-07-31 12:49:01 +1000 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2023-07-31 14:47:08 +1000 |
| commit | 2e6ce68fba372f2a334abfe3f0118782776b8b74 (patch) | |
| tree | 9c57a7c283bed54ed15647846fa9c446e3514f36 /compiler/rustc_expand/src | |
| parent | d72fc5ce445c9a84dc289334b8aa7b34a144619b (diff) | |
| download | rust-2e6ce68fba372f2a334abfe3f0118782776b8b74.tar.gz rust-2e6ce68fba372f2a334abfe3f0118782776b8b74.zip | |
Remove `desugar_doc_comments` arg from `Parser::new()`.
It's only true at one call site; do the desugaring there instead.
Diffstat (limited to 'compiler/rustc_expand/src')
| -rw-r--r-- | compiler/rustc_expand/src/mbe/macro_rules.rs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/compiler/rustc_expand/src/mbe/macro_rules.rs b/compiler/rustc_expand/src/mbe/macro_rules.rs index dcf11527ba9..0e4af6f1c03 100644 --- a/compiler/rustc_expand/src/mbe/macro_rules.rs +++ b/compiler/rustc_expand/src/mbe/macro_rules.rs @@ -249,7 +249,7 @@ fn expand_macro<'cx>( trace_macros_note(&mut cx.expansions, sp, msg); } - let p = Parser::new(sess, tts, false, None); + let p = Parser::new(sess, tts, None); if is_local { cx.resolver.record_macro_rule_usage(node_id, i); @@ -446,7 +446,7 @@ pub fn compile_declarative_macro( let create_parser = || { let body = macro_def.body.tokens.clone(); - Parser::new(&sess.parse_sess, body, false, rustc_parse::MACRO_ARGUMENTS) + Parser::new(&sess.parse_sess, body, rustc_parse::MACRO_ARGUMENTS) }; let parser = create_parser(); @@ -1417,6 +1417,11 @@ fn quoted_tt_to_string(tt: &mbe::TokenTree) -> String { } } -pub(super) fn parser_from_cx(sess: &ParseSess, tts: TokenStream, recovery: Recovery) -> Parser<'_> { - Parser::new(sess, tts, true, rustc_parse::MACRO_ARGUMENTS).recovery(recovery) +pub(super) fn parser_from_cx( + sess: &ParseSess, + mut tts: TokenStream, + recovery: Recovery, +) -> Parser<'_> { + tts.desugar_doc_comments(); + Parser::new(sess, tts, rustc_parse::MACRO_ARGUMENTS).recovery(recovery) } |
