Skip to content

Rollup of 6 pull requests - #146388

Closed
GuillaumeGomez wants to merge 20 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-h8iruhv
Closed

Rollup of 6 pull requests#146388
GuillaumeGomez wants to merge 20 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-h8iruhv

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Sep 9, 2025

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

nnethercoteand others added 20 commits September 8, 2025 06:07
- The empty symbol is no longer a keyword.
- I don't think any of the special reserved identifiers are used for
error recovery.
there is no reason this should not work, really, we're just cutting some scope for now
…rochenkov
Minor symbol comment fixes.
- The empty symbol is no longer a keyword.
- I don't think any of the special reserved identifiers are used for error recovery.
r? ``@petrochenkov``
…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)
Fixesrust-lang#145945.
Fixesrust-lang#146132.
r? fee1-dead
…3, r=workingjubilee
Improve C-variadic error messages: part 2
tracking issue: rust-lang#44930
a reimplementation of rust-lang#143546 that builds on rust-lang#146165.
This PR
- disallows coroutines (e.g. `async fn`) from having a `...` argument
- disallows associated functions (both in traits and standard impl blocks) from having a `...` argument
- splits up a generic "ill-formed C-variadic function" into specific errors about using an incorrect ABI, not specifying an ABI, or missing the unsafe keyword
C-variadic coroutines probably don't make sense? C-variadic functions are for FFI purposes, combining that with async functions seems weird.
For associated functions, we're just cutting scope. It's probably fine, but it's probably better to explicitly allow it. So for now, at least give a more targeted error message.
Made to be reviewed commit-by-commit.
cc ``@workingjubilee``
r? compiler
… r=fee1-dead
report duplicate symbols added by the driver
The panic message did not mention what symbols were duplicates, which made the panic hard to debug. This came up in [#t-compiler/help > Easiest way to find offending duplicate symbols](https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/Easiest.20way.20to.20find.20offending.20duplicate.20symbols/with/538295740).
This behavior was introduced in rust-lang#138682.
r? ``@fee1-dead``
…est, r=GuillaumeGomez
Update `browser-ui-test` version to `0.22.2`
Mostly some internal improvements and new commands (like `store-count`).
r? ``@lolbinarycat``
… r=tgross35
Fix `compare_against_sw_vers` test
The `saturating_sub` doesn't actually perform its intended since the version numbers are signed integers (which I changed in a later revision of rust-lang#138944).
Fixes the issue described in rust-lang#138944 (comment).
r? tgross35
@rustbotrustbot added O-apple Operating system: Apple / Darwin (macOS, iOS, tvOS, visionOS, watchOS) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 9, 2025
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=5 rollup=never

@bors

bors commented Sep 9, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 6dbb46c has been approved by GuillaumeGomez

It is now in the queue for this repository.

@borsbors 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
@bors

bors commented Sep 10, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6dbb46c with merge 79f13ca...

bors added a commit that referenced this pull request Sep 10, 2025
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
@bors

bors commented Sep 10, 2025

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

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

Copy link
Copy Markdown
MemberAuthor

I think CI bugged. Since another rollup is already open, let's close it.

@rustbotrustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 10, 2025
@GuillaumeGomez
GuillaumeGomez deleted the rollup-h8iruhv branch September 10, 2025 09:40
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-appleOperating system: Apple / Darwin (macOS, iOS, tvOS, visionOS, watchOS)rollupA PR which is a rollupT-clippyRelevant to the Clippy team.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustfmtRelevant to the rustfmt team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@GuillaumeGomez@bors@rustbot@nnethercote@folkertdev@fmease@madsmtm