Skip to content

Rollup of 7 pull requests#156986

Open
JonathanBrouwer wants to merge 15 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-SGCQqBl
Open

Rollup of 7 pull requests#156986
JonathanBrouwer wants to merge 15 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-SGCQqBl

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

Kokoro2336 and others added 15 commits May 26, 2026 02:01
chore: update .fixed.

fix: suggestion.

Revert irrelevant changes.
…stebank

Fix missing suggestion when matching `String` with `&str`

Fixes rust-lang#156404

Add suggestion when matching `String` with `&str`
rustc_parse_format: improve the error diagnostic for `+` sign flag

Added a new parser diagnostic in rustc_parse_format that detects when the `+` sign flag is used without a preceding colon in a format string (e.g., `{+}`) and provides a helpful error message and suggestion to use `{:+}` instead.

r? estebank
fix issue-144595

I close the previous PR because it's too messy

relevant issue:rust-lang#144595

I fix this issue by calling `look_ahead` to check if the user write a name field in the tuple struct, then try to recover after calling `parse_ty`
…eGomez

rustdoc: avoid ICE when rendering body-less type consts

close: rust-lang#149287
…r=JonathanBrouwer

Remove unneeded `#[skip_arg]` attributes

@mejrs talked with me about the `Diagnostic` rework that happened recently and suggested that the `skip_arg` might be unneeded. This PR removes all of them, except one. I'll run a perf check to see if it's actually worth keeping around or if we can just remove this attribute altogether (or eventually do the same thing in the proc-macro directly).

cc @JonathanBrouwer

r? ghost
…drieril

add field_projections fixme

haven't looked at the code in detail, but I can't see a way in which this is the correct behavior. I think ideally `try_evaluate_added_goals` just doens't return the certainty as afaik it only does so because `evaluate_added_goals_and_make_canonical_response` uses it internally

r? @Nadrieril @BennoLossin
…omez,JonathanBrouwer

Move check_cfg out of diagnostic attr module

r? @GuillaumeGomez
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 26, 2026
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 26, 2026
@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-2

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 26, 2026

📌 Commit dc556da has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 May 26, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request May 26, 2026
Rollup of 7 pull requests


try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-2
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request May 26, 2026
…uwer

Rollup of 7 pull requests

Successful merges:

 - #156796 (Fix missing suggestion when matching `String` with `&str`)
 - #156933 (rustc_parse_format: improve the error diagnostic for `+` sign flag)
 - #156545 (fix issue-144595)
 - #156851 (rustdoc: avoid ICE when rendering body-less type consts)
 - #156942 (Remove unneeded `#[skip_arg]` attributes)
 - #156972 (add field_projections fixme)
 - #156975 (Move check_cfg out of diagnostic attr module)
@rust-bors rust-bors Bot 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 May 26, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 26, 2026

💔 Test for d666280 failed: CI. Failed job:

@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

The job x86_64-msvc-2 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
Caused by:
  unable to update registry `crates-io`

Caused by:
  download of ru/st/rustc_version failed

Caused by:
  curl failed

Caused by:
  [28] Timeout was reached (Failed to connect to index.crates.io port 443 after 21026 ms: Could not connect to server)
Bootstrap failed while executing `test --stage 2 --skip=tests --skip=coverage-map --skip=coverage-run --skip=library --skip=tidyselftest`
Build completed unsuccessfully in 0:00:34
make: *** [Makefile:117: ci-msvc-ps1] Error 1
  local time: Tue May 26 19:34:23 CUT 2026
  network time: Tue, 26 May 2026 19:34:23 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

@jhpratt
Copy link
Copy Markdown
Member

jhpratt commented May 26, 2026

@bors retry

@rust-bors rust-bors Bot 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 May 26, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 26, 2026

☀️ Try build successful (CI)
Build commit: be9e465 (be9e46556848cf792a90e03ca7fac13a247c2038, parent: b4fefcd60bfd770510f7dc540e887dd3ba4fe5c1)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself rollup A PR which is a rollup 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.