Skip to content

Rollup of 7 pull requests #141011

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 15 commits into from
May 15, 2025
Merged

Rollup of 7 pull requests #141011

merged 15 commits into from
May 15, 2025
+194 −46

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 15 commits May 9, 2025 14:42
@compiler-errors
Do not ICE when reassigning in GatherLocalsVisitor on the bad path
a4707a4
@ehuss
Add an issue template for future-incompatible lints
f6aeef3
@jieyouxu
compiletest: fix "blessing" message
82fbbc0 
It was showing compare mode instead of test name.
@Berrysoft
Update rustix to 1.0.7 for bootstrap
4fcd33c
@mathisbot
MaybeUninit::write: fix doc
c610177
@xizheyin
Add ui test suggest-box-for-expr-field-issue-139631
dca57c6 
Signed-off-by: xizheyin <[email protected]>
@xizheyin
Suggest replace f with f: Box<f> when expr field is short hand
32be459 
Signed-off-by: xizheyin <[email protected]>
@samueltardieu
Add Ipv4Addr and Ipv6Addr diagnostic items
7b1ba42 
They will be used in Clippy to detect runtime parsing of known-valid
IP addresses.
@matthiaskrgr
Rollup merge of rust-lang#140827 - compiler-errors:gather-locals-twic…
dcb808e 
…e, r=oli-obk

Do not ICE when reassigning in GatherLocalsVisitor on the bad path

Fixes rust-lang#140785
Fixes rust-lang#140730

See comment in code.

r? oli-obk
@matthiaskrgr
Rollup merge of rust-lang#140904 - ehuss:future-incompat-template, r=…
0267905 
…Mark-Simulacrum

Add an issue template for future-incompatible lints

This adds a GitHub issue template for future-incompatible lints. Most of the existing tracking issues have been using different formats with different information, and I think it would be helpful to make them a little more consistent and to ensure that sufficient information is provided.

Some comments on my choices:
* Added a dedicated section to describe *why* the change is being made. Many existing issues already have this, so let's standardize on it.
* Have a section with a very clear example. Almost all of the existing issues have this in one form or another.
* Added a "Recommendations" section, since this is something I see missing in several of the existing issues, and this is really important information IMHO.
* I reworded the "When" section. The existing template mentioned that these get reviewed every 6 weeks which my understanding is not true. That's also not very helpful information to the user, since it doesn't really answer the question. I'm not sure this section will actually be useful since I suspect most of the time we don't know when it will change (there have been a few exceptions).
* Clearly show the expected progression steps. Several issues already have this.
* Added implementation history, which is useful for linking PRs. (IDK, this could get merged with "Steps".)
@matthiaskrgr
Rollup merge of rust-lang#140953 - jieyouxu:compiletest-bless-msg, r=…
8e34100 
…compiler-errors

Fix a compiletest blessing message

It was showing compare mode instead of test name.

Fixes rust-lang#140945.
Noticed in rust-lang#140622 (comment).
@matthiaskrgr
Rollup merge of rust-lang#140973 - Berrysoft:update-bootstrap-lock, r…
bbd2301 
…=jieyouxu

Update rustix to 1.0.7 for bootstrap

Another bump for bootstrap. Finally it compiles on Cygwin:) Hooray!

r? ``@jieyouxu``
@matthiaskrgr
Rollup merge of rust-lang#140976 - samueltardieu:diag-ipaddr-v4v6, r=…
a1b5841 
…Urgau

Add `Ipv4Addr` and `Ipv6Addr` diagnostic items

They will be used in Clippy to detect runtime parsing of known-valid IP addresses.
@matthiaskrgr
Rollup merge of rust-lang#140988 - mathisbot:docfix_maybeuninit_write…
8395461 
…, r=tgross35

MaybeUninit::write: fix doc

# Fix doc for `MaybeUninit::write`

The documentation refers to the way `MaybeUninit` stores data internally. The property of not dropping content on context exit is the responsibility of `ManuallyDrop`.
@matthiaskrgr
Rollup merge of rust-lang#140989 - xizheyin:issue-139631, r=compiler-…
e39ab25 
…errors

Suggest replace f with f: Box<f> when expr field is short hand

Fixes rust-lang#139631

r? compiler
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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 14, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 14, 2025

📌 Commit e39ab25 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 14, 2025
@bors
Copy link
Collaborator

bors commented May 14, 2025

⌛ Testing commit e39ab25 with merge 695b091...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2025
@bors
Auto merge of rust-lang#141011 - matthiaskrgr:rollup-4uwllo2, r=matth…
695b091 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#140827 (Do not ICE when reassigning in GatherLocalsVisitor on the bad path)
 - rust-lang#140904 (Add an issue template for future-incompatible lints)
 - rust-lang#140953 (Fix a compiletest blessing message)
 - rust-lang#140973 (Update rustix to 1.0.7 for bootstrap)
 - rust-lang#140976 (Add `Ipv4Addr` and `Ipv6Addr` diagnostic items)
 - rust-lang#140988 (MaybeUninit::write: fix doc)
 - rust-lang#140989 (Suggest replace f with f: Box<f> when expr field is short hand)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented May 14, 2025

💔 Test failed - checks-actions

@bors
Copy link
Collaborator

bors commented May 15, 2025

💔 Test failed - checks-actions

@bors bors 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 15, 2025
@matthiaskrgr
Copy link
Member Author

@bors p=5

@matthiaskrgr
Copy link
Member Author

@bors retry

@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 15, 2025
@bors bors mentioned this pull request May 15, 2025
Open
@Berrysoft
Copy link
Contributor

FWIW, AFAIK it's still possible to get merges through: you just have to be slightly lucky and roll the 20250504 windows server 2025 image instead of the 20250427 image :D

How about using windows-2022 instead? :)

@jieyouxu
Copy link
Member

UPD: CI failure tracking issue is #141022.

@jieyouxu
Copy link
Member

How about using windows-2022 instead? :)

Thanks for that suggestion, trying this in #141023.

This was referenced May 15, 2025
Open
Merged
Open
Open
Open
Open
Open
Merged
Merged
Merged
@jieyouxu
Copy link
Member

jieyouxu commented May 15, 2025 •
edited
Loading

We're now using a workaround to temporarily fallback to Windows Server 2022 images for x86_64-msvc-{1,2}.
@/bors treeclosed-

EDIT(jieyouxu): manually editing out the treeclosed comment to avoid this being picked up in a future sync.

@bors
Copy link
Collaborator

bors commented May 15, 2025

⌛ Testing commit e39ab25 with merge d163a28381c297a56417d4a5dfe88c6c65429265...

@bors
Copy link
Collaborator

bors commented May 15, 2025

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

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#140827 Do not ICE when reassigning in GatherLocalsVisitor on the b… f15dd86b7a97ff5b628a9a3808923e11f648bdd9 (link)
#140904 Add an issue template for future-incompatible lints 6576dcfd561f52e172426fed37d60537051577b7 (link)
#140953 Fix a compiletest blessing message 4c7c8105cf41008448d83c51f9724d278a8a8744 (link)
#140973 Update rustix to 1.0.7 for bootstrap 82a1baba07dea455f3718ee44b44ae06dea8f0c9 (link)
#140976 Add Ipv4Addr and Ipv6Addr diagnostic items c0cf11e39235a65bb7d84fc777f7d5121f70def2 (link)
#140988 MaybeUninit::write: fix doc a276831227d915f5f45696d3d79a5d5029f5e126 (link)
#140989 Suggest replace f with f: Box when expr field is short h… 5e6626cdc9cc2e91a7b86bbb75fceccd3be365b7 (link)

previous master: 2a5da7acd4

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

@github-actions GitHub Actions
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 2a5da7a (parent) -> d163a28 (this PR)

Test differences

Show 300 test diffs

Stage 1

  • [ui] tests/ui/box/suggest-box-for-expr-field-issue-139631.rs: [missing] -> pass (J0)
  • [ui] tests/ui/typeck/gather-locals-twice.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/box/suggest-box-for-expr-field-issue-139631.rs: [missing] -> pass (J1)
  • [ui] tests/ui/typeck/gather-locals-twice.rs: [missing] -> pass (J1)

Additionally, 296 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard d163a28381c297a56417d4a5dfe88c6c65429265 --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-apple-various: 6338.7s -> 10358.5s (63.4%)
  2. dist-x86_64-apple: 8514.1s -> 11586.4s (36.1%)
  3. x86_64-apple-1: 9719.9s -> 11122.2s (14.4%)
  4. dist-arm-linux: 4953.3s -> 4503.4s (-9.1%)
  5. dist-riscv64-linux: 5025.0s -> 5429.9s (8.1%)
  6. aarch64-apple: 4782.9s -> 5105.4s (6.7%)
  7. dist-aarch64-apple: 5482.5s -> 5827.8s (6.3%)
  8. dist-x86_64-freebsd: 4973.5s -> 5281.0s (6.2%)
  9. dist-x86_64-msvc-alt: 7322.5s -> 7699.9s (5.2%)
  10. x86_64-gnu-tools: 5899.3s -> 6125.8s (3.8%)
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 (d163a28): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅
(primary)		 -0.8% [-0.9%, -0.8%] 4
Improvements ✅
(secondary)		 -0.4% [-0.6%, -0.2%] 8
All ❌✅ (primary) -0.8% [-0.9%, -0.8%] 4

Max RSS (memory usage)

Results (primary -0.5%, secondary -2.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)		 1.2% [1.2%, 1.2%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.1% [-2.1%, -2.1%] 1
Improvements ✅
(secondary)		 -2.9% [-2.9%, -2.9%] 1
All ❌✅ (primary) -0.5% [-2.1%, 1.2%] 2

Cycles

Results (primary 1.5%, secondary 7.4%)

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)		 1.5% [1.5%, 1.5%] 1
Regressions ❌
(secondary)		 7.4% [7.4%, 7.4%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 1.5% [1.5%, 1.5%] 1

Binary size

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

Bootstrap: 773.204s -> 772.725s (-0.06%)
Artifact size: 365.39 MiB -> 365.38 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-compiletest Area: The compiletest test runner A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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
Milestone
1.89.0
Development

Successfully merging this pull request may close these issues.