Skip to content

Commit 2e6ce68

Browse files
committed
Remove desugar_doc_comments arg from Parser::new().
It's only true at one call site; do the desugaring there instead.
1 parent d72fc5c commit 2e6ce68

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

compiler/rustc_expand/src/mbe/macro_rules.rs

+9-4
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ fn expand_macro<'cx>(
249249
trace_macros_note(&mut cx.expansions, sp, msg);
250250
}
251251

252-
let p = Parser::new(sess, tts, false, None);
252+
let p = Parser::new(sess, tts, None);
253253

254254
if is_local {
255255
cx.resolver.record_macro_rule_usage(node_id, i);
@@ -446,7 +446,7 @@ pub fn compile_declarative_macro(
446446

447447
let create_parser = || {
448448
let body = macro_def.body.tokens.clone();
449-
Parser::new(&sess.parse_sess, body, false, rustc_parse::MACRO_ARGUMENTS)
449+
Parser::new(&sess.parse_sess, body, rustc_parse::MACRO_ARGUMENTS)
450450
};
451451

452452
let parser = create_parser();
@@ -1417,6 +1417,11 @@ fn quoted_tt_to_string(tt: &mbe::TokenTree) -> String {
14171417
}
14181418
}
14191419

1420-
pub(super) fn parser_from_cx(sess: &ParseSess, tts: TokenStream, recovery: Recovery) -> Parser<'_> {
1421-
Parser::new(sess, tts, true, rustc_parse::MACRO_ARGUMENTS).recovery(recovery)
1420+
pub(super) fn parser_from_cx(
1421+
sess: &ParseSess,
1422+
mut tts: TokenStream,
1423+
recovery: Recovery,
1424+
) -> Parser<'_> {
1425+
tts.desugar_doc_comments();
1426+
Parser::new(sess, tts, rustc_parse::MACRO_ARGUMENTS).recovery(recovery)
14221427
}

compiler/rustc_parse/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ pub fn stream_to_parser<'a>(
205205
stream: TokenStream,
206206
subparser_name: Option<&'static str>,
207207
) -> Parser<'a> {
208-
Parser::new(sess, stream, false, subparser_name)
208+
Parser::new(sess, stream, subparser_name)
209209
}
210210

211211
/// Runs the given subparser `f` on the tokens of the given `attr`'s item.
@@ -215,7 +215,7 @@ pub fn parse_in<'a, T>(
215215
name: &'static str,
216216
mut f: impl FnMut(&mut Parser<'a>) -> PResult<'a, T>,
217217
) -> PResult<'a, T> {
218-
let mut parser = Parser::new(sess, tts, false, Some(name));
218+
let mut parser = Parser::new(sess, tts, Some(name));
219219
let result = f(&mut parser)?;
220220
if parser.token != token::Eof {
221221
parser.unexpected()?;

compiler/rustc_parse/src/parser/mod.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -388,14 +388,9 @@ pub(super) fn token_descr(token: &Token) -> String {
388388
impl<'a> Parser<'a> {
389389
pub fn new(
390390
sess: &'a ParseSess,
391-
mut stream: TokenStream,
392-
desugar_doc_comments: bool,
391+
stream: TokenStream,
393392
subparser_name: Option<&'static str>,
394393
) -> Self {
395-
if desugar_doc_comments {
396-
stream.desugar_doc_comments();
397-
}
398-
399394
let mut parser = Parser {
400395
sess,
401396
token: Token::dummy(),

0 commit comments

Comments
 (0)