Strip frontmatter in fewer places #146340

fmease · 2025-09-08T17:26:56Z

Stop stripping frontmatter in proc_macro::Literal::from_str (RUST-146132)
Stop stripping frontmatter in expr-ctxt (but not item-ctxt!) includes (RUST-145945)
Stop stripping shebang (!) in proc_macro::Literal::from_str
- Not a breaking change because it did compare spans already to ensure there wasn't extra whitespace or comments (Literal::from_str("#!\n0") already yields Err(_) thankfully!)
Stop stripping frontmatter+shebang inside some rustdoc code where it doesn't make any observable difference (see self review comments)
(Stop stripping frontmatter+shebang inside internal test code)

r? fee1-dead

fmease · 2025-09-09T16:07:37Z

compiler/rustc_expand/src/proc_macro_server.rs

+            self.psess(),
+            name,
+            s.to_owned(),
+            StripTokens::Nothing,


Updating this to not strip shebangs isn't breaking.

It already compares spans below to ensure no extra trivia is contained like whitespace, comments or – well – shebangs. However, it's just cleaner to pass Nothing here.

fmease · 2025-09-09T16:09:40Z

compiler/rustc_parse/src/lib.rs

 ///
 /// On failure, the errors must be consumed via `unwrap_or_emit_fatal`, `emit`, `cancel`,
 /// etc., otherwise a panic will occur when they are dropped.
-pub fn new_parser_from_simple_source_str(


Removing this convenience wrapper (for StripTokens::Nothing) to force all callers to have to think what behavior they want which is a lot more robust. Otherwise, people will just overlook this function and blindly go for the "normal" variant new_parser_from_source_str.

fmease · 2025-09-09T16:12:27Z

compiler/rustc_parse/src/lib.rs

    psess: &ParseSess,
    name: FileName,
    source: String,
    override_span: Option<Span>,


I might add strip_tokens: StripTokens as a parameter to this function in a future PR. At the time of writing, it wouldn't really matter but there are some call sites like the one for -Zcrate-attr where we could pass StripTokens::Nothing (since the input is wrapped in #![ ] anyway) but it wouldn't lead to any observable difference in rustc's behavior.

fmease · 2025-09-09T16:14:50Z

src/librustdoc/clean/render_macro_matchers.rs

+        &psess,
+        file_name,
+        snippet.clone(),
+        StripTokens::Nothing,


Shouldn't make a difference since this is for (re)parsing macro matchers which will have already been validated by rustc and shebangs or frontmatters aren't part of that subgrammar.

fmease · 2025-09-09T16:16:25Z

compiler/rustc_parse/src/parser/tests.rs

This is just test code; use StripTokens::Nothing for simplicity. If anybody wants to test shebangs and/or frontmatter in here, they can just update it.

fmease · 2025-09-09T16:17:45Z

src/librustdoc/doctest/make.rs

-    };
+    // Don't strip any tokens; it wouldn't matter anyway because the source is wrapped in a function.
+    let mut parser =
+        match new_parser_from_source_str(&psess, filename, wrapped_source, StripTokens::Nothing) {


Change is unobservable as the added comment explains.

fmease · 2025-09-09T16:18:07Z

tests/ui-fulldeps/auxiliary/parser.rs

    let parser = rustc_parse::unwrap_or_emit_fatal(rustc_parse::new_parser_from_source_str(
        psess,
        FileName::anon_source_code(source_code),
+        rustc_parse::lexer::StripTokens::Nothing,


This is also just test code.

rustbot · 2025-09-09T16:22:19Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Urgau

Looks good to me.

View changes since this review

src/tools/clippy/clippy_lints/src/doc/needless_doctest_main.rs

fee1-dead

Awesome, r=me when green

View changes since this review

fmease · 2025-09-09T19:09:01Z

@bors r=fee1-dead,Urgau rollup

bors · 2025-09-09T19:09:04Z

📌 Commit 7a66925 has been approved by fee1-dead,Urgau

It is now in the queue for this repository.

…fee1-dead,Urgau Strip frontmatter in fewer places * Stop stripping frontmatter in `proc_macro::Literal::from_str` (RUST-146132) * Stop stripping frontmatter in expr-ctxt (but not item-ctxt!) `include`s (RUST-145945) * Stop stripping shebang (!) in `proc_macro::Literal::from_str` * Not a breaking change because it did compare spans already to ensure there wasn't extra whitespace or comments (`Literal::from_str("#!\n0")` already yields `Err(_)` thankfully!) * Stop stripping frontmatter+shebang inside some rustdoc code where it doesn't make any observable difference (see self review comments) * (Stop stripping frontmatter+shebang inside internal test code) Fixes rust-lang#145945. Fixes rust-lang#146132. r? fee1-dead

Rollup of 6 pull requests Successful merges: - #146311 (Minor symbol comment fixes.) - #146340 (Strip frontmatter in fewer places) - #146342 (Improve C-variadic error messages: part 2) - #146347 (report duplicate symbols added by the driver) - #146374 (Update `browser-ui-test` version to `0.22.2`) - #146379 (Fix `compare_against_sw_vers` test) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 8 pull requests Successful merges: - #145327 (std: make address resolution weirdness local to SGX) - #145879 (default auto traits: use default supertraits instead of `Self: Trait` bounds on associated items) - #146123 (Suggest examples of format specifiers in error messages) - #146311 (Minor symbol comment fixes.) - #146322 (Make Barrier RefUnwindSafe again) - #146327 (Add tests for deref on pin) - #146340 (Strip frontmatter in fewer places) - #146342 (Improve C-variadic error messages: part 2) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #146340 - fmease:frontmatter-containment, r=fee1-dead,Urgau Strip frontmatter in fewer places * Stop stripping frontmatter in `proc_macro::Literal::from_str` (RUST-146132) * Stop stripping frontmatter in expr-ctxt (but not item-ctxt!) `include`s (RUST-145945) * Stop stripping shebang (!) in `proc_macro::Literal::from_str` * Not a breaking change because it did compare spans already to ensure there wasn't extra whitespace or comments (`Literal::from_str("#!\n0")` already yields `Err(_)` thankfully!) * Stop stripping frontmatter+shebang inside some rustdoc code where it doesn't make any observable difference (see self review comments) * (Stop stripping frontmatter+shebang inside internal test code) Fixes #145945. Fixes #146132. r? fee1-dead

…fee1-dead,Urgau Strip frontmatter in fewer places * Stop stripping frontmatter in `proc_macro::Literal::from_str` (RUST-146132) * Stop stripping frontmatter in expr-ctxt (but not item-ctxt!) `include`s (RUST-145945) * Stop stripping shebang (!) in `proc_macro::Literal::from_str` * Not a breaking change because it did compare spans already to ensure there wasn't extra whitespace or comments (`Literal::from_str("#!\n0")` already yields `Err(_)` thankfully!) * Stop stripping frontmatter+shebang inside some rustdoc code where it doesn't make any observable difference (see self review comments) * (Stop stripping frontmatter+shebang inside internal test code) Fixes rust-lang#145945. Fixes rust-lang#146132. r? fee1-dead

rustbot assigned fee1-dead Sep 8, 2025

This comment has been minimized.

Sign in to view

fmease force-pushed the frontmatter-containment branch from 7f38e98 to 6071c21 Compare September 8, 2025 17:33

This comment has been minimized.

Sign in to view

fmease force-pushed the frontmatter-containment branch from 6071c21 to 50f74e5 Compare September 8, 2025 18:05

This comment has been minimized.

Sign in to view

Improve docs of certain built-in macro expanders

ec87250

fmease force-pushed the frontmatter-containment branch from 50f74e5 to 96edbd6 Compare September 9, 2025 15:17

This comment has been minimized.

Sign in to view

fmease commented Sep 9, 2025

View reviewed changes

fmease force-pushed the frontmatter-containment branch from 96edbd6 to 541e36f Compare September 9, 2025 16:22

fmease marked this pull request as ready for review September 9, 2025 16:22

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 9, 2025

fmease mentioned this pull request Sep 9, 2025

[STACKED] Don't strip shebang in expr-ctxt include!(…) #146377

Draft

Urgau approved these changes Sep 9, 2025

View reviewed changes

src/tools/clippy/clippy_lints/src/doc/needless_doctest_main.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

Strip frontmatter in fewer places

7a66925

fmease force-pushed the frontmatter-containment branch from 541e36f to 7a66925 Compare September 9, 2025 17:49

fee1-dead approved these changes Sep 9, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 9, 2025

GuillaumeGomez mentioned this pull request Sep 9, 2025

Rollup of 10 pull requests #146387

Closed

GuillaumeGomez mentioned this pull request Sep 9, 2025

Rollup of 6 pull requests #146388

Closed

matthiaskrgr mentioned this pull request Sep 10, 2025

Rollup of 8 pull requests #146418

Merged

bors merged commit 86d39a0 into rust-lang:master Sep 11, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Sep 11, 2025

fmease deleted the frontmatter-containment branch September 11, 2025 00:44

epage mentioned this pull request Sep 16, 2025

Stabilize cargo-script rust-lang/rust-project-goals#119

Open

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Strip frontmatter in fewer places #146340

Strip frontmatter in fewer places #146340

fmease commented Sep 8, 2025 •

edited

Loading

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

fmease Sep 9, 2025 •

edited

Loading

Uh oh!

fmease Sep 9, 2025 •

edited

Loading

Uh oh!

fmease Sep 9, 2025 •

edited

Loading

Uh oh!

fmease Sep 9, 2025

Uh oh!

fmease Sep 9, 2025

Uh oh!

fmease Sep 9, 2025

Uh oh!

fmease Sep 9, 2025

Uh oh!

rustbot commented Sep 9, 2025

Uh oh!

Urgau left a comment •

edited by rustbot

Loading

Uh oh!

Uh oh!

This comment has been minimized.

fee1-dead left a comment •

edited by rustbot

Loading

Uh oh!

fmease commented Sep 9, 2025

Uh oh!

bors commented Sep 9, 2025

Uh oh!

Uh oh!

Uh oh!

Strip frontmatter in fewer places #146340

Strip frontmatter in fewer places #146340

Conversation

fmease commented Sep 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

fmease Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fmease Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fmease Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fmease Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

fmease Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

fmease Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

fmease Sep 9, 2025

Choose a reason for hiding this comment

Uh oh!

rustbot commented Sep 9, 2025

Uh oh!

Urgau left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment has been minimized.

fee1-dead left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fmease commented Sep 9, 2025

Uh oh!

bors commented Sep 9, 2025

Uh oh!

Uh oh!

Uh oh!

fmease commented Sep 8, 2025 •

edited

Loading

fmease Sep 9, 2025 •

edited

Loading

fmease Sep 9, 2025 •

edited

Loading

fmease Sep 9, 2025 •

edited

Loading

Urgau left a comment •

edited by rustbot

Loading

fee1-dead left a comment •

edited by rustbot

Loading