Skip to content

fix: Include frontmatter in -Zunpretty output #143708

Merged
bors merged 4 commits intorust-lang:masterfrom
epage:pretty
Jul 12, 2025
Merged

fix: Include frontmatter in -Zunpretty output #143708
bors merged 4 commits intorust-lang:masterfrom
epage:pretty

Conversation

@epage
Copy link
Contributor

@epage epage commented Jul 9, 2025 •
edited by rustbot
Loading

In the implementation (#140035), this was left as an open question for
the tracking issue (#136889). My assumption is that this should be
carried over.

The test was carried over from #137193 which was superseded by #140035.

Thankfully, either way, -Zunpretty is unstable and we can always
change it even if we stabilize frontmatter.

@rustbot
Copy link
Collaborator

rustbot commented Jul 9, 2025

r? @SparrowLii

rustbot has assigned @SparrowLii.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 9, 2025
compiler-errors
compiler-errors reviewed Jul 9, 2025
View reviewed changes
compiler/rustc_lexer/src/lib.rs Outdated
/// Creates an iterator that produces tokens from the input string.
///
/// Be sure to call [`strip_shebang`] first
pub fn tokenize_document(input: &str) -> impl Iterator<Item = Token> {
Copy link
Contributor

@compiler-errors compiler-errors Jul 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could this name + doc comment be more descriptive? i don't think it's obvious from the name or the doc comment that this one allows front-matter and the one above does not.

Copy link
Contributor

@compiler-errors compiler-errors Jul 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alternatively, tokenize could just take FrontmatterAllowed as an argument

Copy link
Contributor Author

@epage epage Jul 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updating tokenize looks to be a cross-repo change, also affecting clippy.

Looking over the external repos docs, it sounds like I'm free to make those updates in this PR and the maintainers of those subtrees will sync those back to the external repos?

Copy link
Contributor

@compiler-errors compiler-errors Jul 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, anything that you need to do to unbreak subrepos can be done in-tree.

@rustbot
Copy link
Collaborator

rustbot commented Jul 9, 2025

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

@compiler-errors
Copy link
Contributor

compiler-errors commented Jul 9, 2025

r=me when CI is green

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Contributor

compiler-errors commented Jul 9, 2025

Pls fix compiler/rustc_lexer/src/tests.rs, but maybe that's a good place to place a test too?

@epage epage mentioned this pull request Jul 10, 2025
Open
11 tasks
epage added 2 commits July 10, 2025 10:25
@epage
test(lexer): Add frontmatter unit test
df53b3d
@epage
fix: Include frontmatter in -Zunpretty output
a11ee56 
In the implementation (rust-lang#140035), this was left as an open question for
the tracking issue (rust-lang#136889).  My assumption is that this should be
carried over.

Thankfully, either way, `-Zunpretty` is unstable and we can always
change it even if we stabilize frontmatter.
@epage epage mentioned this pull request Jul 10, 2025
Open
14 tasks
@epage
Copy link
Contributor Author

epage commented Jul 10, 2025

@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented Jul 10, 2025

📌 Commit a11ee56 has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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 Jul 10, 2025
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 10, 2025
@tgross35
Rollup merge of rust-lang#143708 - epage:pretty, r=compiler-errors
ad7f3cc 
fix: Include frontmatter in -Zunpretty output

In the implementation (rust-lang#140035), this was left as an open question for
the tracking issue (rust-lang#136889).  My assumption is that this should be
carried over.

The test was carried over from rust-lang#137193 which was superseded by rust-lang#140035.

Thankfully, either way, `-Zunpretty` is unstable and we can always
change it even if we stabilize frontmatter.
@tgross35 tgross35 mentioned this pull request Jul 10, 2025
Closed
bors added a commit that referenced this pull request Jul 11, 2025
@bors
Auto merge of #143760 - tgross35:rollup-hyioynq, r=tgross35
5752c21 
Rollup of 7 pull requests

Successful merges:

 - #142391 (rust: library: Add `setsid` method to `CommandExt` trait)
 - #143301 (`tests/ui`: A New Order [26/N])
 - #143302 (`tests/ui`: A New Order [27/N])
 - #143303 (`tests/ui`: A New Order [28/28] FINAL PART)
 - #143568 (std: sys: net: uefi: tcp4: Add timeout support)
 - #143708 (fix: Include frontmatter in -Zunpretty output )
 - #143718 (Make UB transmutes really UB in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Jul 11, 2025
@bors
Auto merge of #143760 - tgross35:rollup-hyioynq, r=tgross35
55cd449 
Rollup of 7 pull requests

Successful merges:

 - #142391 (rust: library: Add `setsid` method to `CommandExt` trait)
 - #143301 (`tests/ui`: A New Order [26/N])
 - #143302 (`tests/ui`: A New Order [27/N])
 - #143303 (`tests/ui`: A New Order [28/28] FINAL PART)
 - #143568 (std: sys: net: uefi: tcp4: Add timeout support)
 - #143708 (fix: Include frontmatter in -Zunpretty output )
 - #143718 (Make UB transmutes really UB in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 11, 2025
Merged
bors added a commit that referenced this pull request Jul 11, 2025
@bors
Auto merge of #143766 - matthiaskrgr:rollup-0x7t69s, r=matthiaskrgr
256cb72 
Rollup of 8 pull requests

Successful merges:

 - #142391 (rust: library: Add `setsid` method to `CommandExt` trait)
 - #143302 (`tests/ui`: A New Order [27/N])
 - #143303 (`tests/ui`: A New Order [28/28] FINAL PART)
 - #143568 (std: sys: net: uefi: tcp4: Add timeout support)
 - #143611 (Mention more APIs in `ParseIntError` docs)
 - #143661 (chore: Improve how the other suggestions message gets rendered)
 - #143708 (fix: Include frontmatter in -Zunpretty output )
 - #143718 (Make UB transmutes really UB in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Jul 11, 2025
@bors
Auto merge of #143766 - matthiaskrgr:rollup-0x7t69s, r=matthiaskrgr
6c42131 
Rollup of 8 pull requests

Successful merges:

 - #142391 (rust: library: Add `setsid` method to `CommandExt` trait)
 - #143302 (`tests/ui`: A New Order [27/N])
 - #143303 (`tests/ui`: A New Order [28/28] FINAL PART)
 - #143568 (std: sys: net: uefi: tcp4: Add timeout support)
 - #143611 (Mention more APIs in `ParseIntError` docs)
 - #143661 (chore: Improve how the other suggestions message gets rendered)
 - #143708 (fix: Include frontmatter in -Zunpretty output )
 - #143718 (Make UB transmutes really UB in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Jul 11, 2025
@bors
Auto merge of #143766 - matthiaskrgr:rollup-0x7t69s, r=<try>
ae2eccf 
Rollup of 8 pull requests

Successful merges:

 - #142391 (rust: library: Add `setsid` method to `CommandExt` trait)
 - #143302 (`tests/ui`: A New Order [27/N])
 - #143303 (`tests/ui`: A New Order [28/28] FINAL PART)
 - #143568 (std: sys: net: uefi: tcp4: Add timeout support)
 - #143611 (Mention more APIs in `ParseIntError` docs)
 - #143661 (chore: Improve how the other suggestions message gets rendered)
 - #143708 (fix: Include frontmatter in -Zunpretty output )
 - #143718 (Make UB transmutes really UB in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: i686-gnu-nopt-1
try-job: test-various
bors added a commit that referenced this pull request Jul 11, 2025
@bors
Auto merge of #143766 - matthiaskrgr:rollup-0x7t69s, r=matthiaskrgr
79464cc 
Rollup of 8 pull requests

Successful merges:

 - #142391 (rust: library: Add `setsid` method to `CommandExt` trait)
 - #143302 (`tests/ui`: A New Order [27/N])
 - #143303 (`tests/ui`: A New Order [28/28] FINAL PART)
 - #143568 (std: sys: net: uefi: tcp4: Add timeout support)
 - #143611 (Mention more APIs in `ParseIntError` docs)
 - #143661 (chore: Improve how the other suggestions message gets rendered)
 - #143708 (fix: Include frontmatter in -Zunpretty output )
 - #143718 (Make UB transmutes really UB in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: i686-gnu-nopt-1
try-job: test-various
bors added a commit that referenced this pull request Jul 12, 2025
@bors
Auto merge of #143766 - matthiaskrgr:rollup-0x7t69s, r=matthiaskrgr
2f9c9ce 
Rollup of 8 pull requests

Successful merges:

 - #142391 (rust: library: Add `setsid` method to `CommandExt` trait)
 - #143302 (`tests/ui`: A New Order [27/N])
 - #143303 (`tests/ui`: A New Order [28/28] FINAL PART)
 - #143568 (std: sys: net: uefi: tcp4: Add timeout support)
 - #143611 (Mention more APIs in `ParseIntError` docs)
 - #143661 (chore: Improve how the other suggestions message gets rendered)
 - #143708 (fix: Include frontmatter in -Zunpretty output )
 - #143718 (Make UB transmutes really UB in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: i686-gnu-nopt-1
try-job: test-various
@bors bors merged commit dbd2f30 into rust-lang:master Jul 12, 2025
11 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 12, 2025
rust-timer added a commit that referenced this pull request Jul 12, 2025
@rust-timer
Unrolled build for #143708
5d9565b 
Rollup merge of #143708 - epage:pretty, r=compiler-errors

fix: Include frontmatter in -Zunpretty output

In the implementation (#140035), this was left as an open question for
the tracking issue (#136889).  My assumption is that this should be
carried over.

The test was carried over from #137193 which was superseded by #140035.

Thankfully, either way, `-Zunpretty` is unstable and we can always
change it even if we stabilize frontmatter.
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Jul 15, 2025
@bors
Auto merge of #143766 - matthiaskrgr:rollup-0x7t69s, r=matthiaskrgr
12994a0 
Rollup of 8 pull requests

Successful merges:

 - rust-lang/rust#142391 (rust: library: Add `setsid` method to `CommandExt` trait)
 - rust-lang/rust#143302 (`tests/ui`: A New Order [27/N])
 - rust-lang/rust#143303 (`tests/ui`: A New Order [28/28] FINAL PART)
 - rust-lang/rust#143568 (std: sys: net: uefi: tcp4: Add timeout support)
 - rust-lang/rust#143611 (Mention more APIs in `ParseIntError` docs)
 - rust-lang/rust#143661 (chore: Improve how the other suggestions message gets rendered)
 - rust-lang/rust#143708 (fix: Include frontmatter in -Zunpretty output )
 - rust-lang/rust#143718 (Make UB transmutes really UB in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: i686-gnu-nopt-1
try-job: test-various
@epage epage deleted the pretty branch July 17, 2025 02:14
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Jul 21, 2025
@bors
Auto merge of rust-lang#143766 - matthiaskrgr:rollup-0x7t69s, r=matth…
528e40f 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#142391 (rust: library: Add `setsid` method to `CommandExt` trait)
 - rust-lang#143302 (`tests/ui`: A New Order [27/N])
 - rust-lang#143303 (`tests/ui`: A New Order [28/28] FINAL PART)
 - rust-lang#143568 (std: sys: net: uefi: tcp4: Add timeout support)
 - rust-lang#143611 (Mention more APIs in `ParseIntError` docs)
 - rust-lang#143661 (chore: Improve how the other suggestions message gets rendered)
 - rust-lang#143708 (fix: Include frontmatter in -Zunpretty output )
 - rust-lang#143718 (Make UB transmutes really UB in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: i686-gnu-nopt-1
try-job: test-various
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jul 25, 2025
@matthiaskrgr
Rollup merge of rust-lang#143708 - epage:pretty, r=compiler-errors
a1844ec 
fix: Include frontmatter in -Zunpretty output

In the implementation (rust-lang#140035), this was left as an open question for
the tracking issue (rust-lang#136889).  My assumption is that this should be
carried over.

The test was carried over from rust-lang#137193 which was superseded by rust-lang#140035.

Thankfully, either way, `-Zunpretty` is unstable and we can always
change it even if we stabilize frontmatter.
@epage epage added the F-frontmatter `#![feature(frontmatter)]` label Oct 22, 2025
@epage epage mentioned this pull request Oct 23, 2025
Open
10 tasks
Kobzol pushed a commit to Kobzol/rustc_codegen_gcc that referenced this pull request Dec 21, 2025
@bors
Auto merge of #143766 - matthiaskrgr:rollup-0x7t69s, r=matthiaskrgr
d1c82ba 
Rollup of 8 pull requests

Successful merges:

 - rust-lang/rust#142391 (rust: library: Add `setsid` method to `CommandExt` trait)
 - rust-lang/rust#143302 (`tests/ui`: A New Order [27/N])
 - rust-lang/rust#143303 (`tests/ui`: A New Order [28/28] FINAL PART)
 - rust-lang/rust#143568 (std: sys: net: uefi: tcp4: Add timeout support)
 - rust-lang/rust#143611 (Mention more APIs in `ParseIntError` docs)
 - rust-lang/rust#143661 (chore: Improve how the other suggestions message gets rendered)
 - rust-lang/rust#143708 (fix: Include frontmatter in -Zunpretty output )
 - rust-lang/rust#143718 (Make UB transmutes really UB in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: i686-gnu-nopt-1
try-job: test-various
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@compiler-errors compiler-errors compiler-errors approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@compiler-errors compiler-errors

Labels

F-frontmatter `#![feature(frontmatter)]` S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.90.0

Development

Successfully merging this pull request may close these issues.

6 participants

@epage @rustbot @compiler-errors @rust-log-analyzer @bors @SparrowLii