Skip to content

Rollup of 7 pull requests #141484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
May 24, 2025
Merged

Rollup of 7 pull requests #141484

merged 14 commits into from
May 24, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fmease and others added 14 commits May 23, 2025 11:08
slight grammar changes for clarity
… r=ChrisDenton

GetUserProfileDirectoryW is now documented to always store the size

Update to match MicrosoftDocs/sdk-api#1810

Also fix a bug in the Miri implementation while I am starting at that code...

r? ```@ChrisDenton```
Fixes rust-lang#141254
…structural-match, r=spastorino

Dont walk into unsafe binders when emiting error for non-structural type match

Fixes rust-lang#141422.

The other two binder-having types are also special cased here, unsurprisingly.

r? oli-obk
…l, r=lcnr

Do not try to confirm non-dyn compatible method

See the comment I left in `compiler/rustc_hir_typeck/src/method/confirm.rs`.

If we have a receiver that does not deref to the `dyn Trait` we're assembling the method from, then we used to ICE, but that's something that is possible to encounter with arbitrary self types.

r? oli-obk
Fixes rust-lang#141419
Improve CONTRIBUTING.md grammar and clarity

slight grammar changes for clarity
Add 2nd Solaris target maintainer

Based on concenr here rust-lang/compiler-team#870 (comment) I propose my coleague ```@kulikjak``` as 2nd Solaris maintainer. He already did some work to Rust in past.
…eyouxu

Suggest correct `version("..")` predicate syntax in check-cfg

This PR specialize the `unexpected_cfgs` lint diagnostic to suggest correct `version("..")` predicate syntax when providing the key-value one, eg. `version = "1.27"`.

Fixes rust-lang#141440
r? ``@jieyouxu``
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself O-windows Operating system: Windows 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 24, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 24, 2025

📌 Commit 8019d08 has been approved by matthiaskrgr

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 May 24, 2025
@bors
Copy link
Collaborator

bors commented May 24, 2025

⌛ Testing commit 8019d08 with merge 3de4f1c...

@bors
Copy link
Collaborator

bors commented May 24, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 3de4f1c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 24, 2025
@bors bors merged commit 3de4f1c into rust-lang:master May 24, 2025
1 check passed
@rustbot rustbot added this to the 1.89.0 milestone May 24, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#141405 GetUserProfileDirectoryW is now documented to always store … bb49804a5773af7c0f67ab59fd2ceb408091dea7 (link)
#141427 Disable triagebot's glacier handler ae3fa5b0ff3a8593c4bd6ad5e7afcf363ab2a2bf (link)
#141429 Dont walk into unsafe binders when emiting error for non-st… af2ccf58fd2da14caa48dab8229e02a8441ade06 (link)
#141438 Do not try to confirm non-dyn compatible method e13065a6deb4b26b1722a0f8ef74573e2ddb89e5 (link)
#141444 Improve CONTRIBUTING.md grammar and clarity 6ccff6695c9cb72446a6a1dbc25e2f517fb339d8 (link)
#141446 Add 2nd Solaris target maintainer a171aea3ed6228abbb087dd9119a58074357c015 (link)
#141456 Suggest correct version("..") predicate syntax in check-c… 69c6b880669984dfdc0cad8f8e8e3678012d640a (link)

previous master: 5af801b687

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

Copy link

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 5af801b (parent) -> 3de4f1c (this PR)

Test differences

Show 6 test diffs

Stage 1

  • [ui] tests/ui/check-cfg/wrong-version-syntax.rs: [missing] -> pass (J1)
  • [ui] tests/ui/self/dispatch-dyn-incompatible-that-does-not-deref.rs: [missing] -> pass (J1)
  • [ui] tests/ui/unsafe-binders/non-strucutral-type-diag.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/check-cfg/wrong-version-syntax.rs: [missing] -> pass (J0)
  • [ui] tests/ui/self/dispatch-dyn-incompatible-that-does-not-deref.rs: [missing] -> pass (J0)
  • [ui] tests/ui/unsafe-binders/non-strucutral-type-diag.rs: [missing] -> pass (J0)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 3de4f1ccf3873782fae2a3883d029ed3d4542581 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-aarch64-linux: 5470.1s -> 7638.6s (39.6%)
  2. dist-aarch64-apple: 5277.2s -> 6469.7s (22.6%)
  3. dist-x86_64-apple: 8015.6s -> 9248.3s (15.4%)
  4. aarch64-gnu-debug: 4021.4s -> 4220.0s (4.9%)
  5. i686-gnu-2: 6536.7s -> 6858.0s (4.9%)
  6. x86_64-msvc-ext2: 5602.9s -> 5877.0s (4.9%)
  7. aarch64-apple: 3975.6s -> 4140.3s (4.1%)
  8. arm-android: 5394.8s -> 5178.9s (-4.0%)
  9. dist-s390x-linux: 5485.9s -> 5279.2s (-3.8%)
  10. x86_64-gnu-tools: 5857.3s -> 6076.6s (3.7%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3de4f1c): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.2% [0.2%, 0.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary -4.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.9% [-4.9%, -4.9%] 1
All ❌✅ (primary) - - 0

Cycles

Results (secondary -6.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-6.9% [-7.2%, -6.4%] 3
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 776.203s -> 777.23s (0.13%)
Artifact size: 366.33 MiB -> 366.32 MiB (-0.00%)

github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request May 26, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#141405 (GetUserProfileDirectoryW is now documented to always store the size)
 - rust-lang#141427 (Disable `triagebot`'s `glacier` handler)
 - rust-lang#141429 (Dont walk into unsafe binders when emiting error for non-structural type match)
 - rust-lang#141438 (Do not try to confirm non-dyn compatible method)
 - rust-lang#141444 (Improve CONTRIBUTING.md grammar and clarity)
 - rust-lang#141446 (Add 2nd Solaris target maintainer)
 - rust-lang#141456 (Suggest correct `version("..")` predicate syntax in check-cfg)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself merged-by-bors This PR was explicitly merged by bors. O-windows Operating system: Windows 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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants