Skip to content
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

Rollup of 7 pull requests #136697

Merged
merged 35 commits into from
Feb 7, 2025
Merged

Rollup of 7 pull requests #136697

merged 35 commits into from
Feb 7, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ehuss and others added 30 commits January 23, 2025 09:28
This is not tracked in toolstate.
This updates the toolstate maintainers to more closely match who is
still active. I am adding myself to ensure these get resolved if they
break, since otherwise it causes other problems.
This aligns the main error message a bit more with the phrasing in the
Edition Guide and provides a bit more information on the labels to
(hopefully!) aid in understanding.
Most of these are meant to test possible future improvements, but since
they cover cases the existing test suite didn't, I figure including them
now may be helpful.
While working on rust-lang#122661, some of these started triggering our "unnecessary parens" lints due to a change in the `assert!` desugaring. A cursory search identified a few more. Some of these have been carried from before 1.0, were a bulk rename from the previous name of `assert!` left them in that state. I went and removed as many of these unnecessary parens as possible in order to have fewer annoyances in the future if we make the lint smarter.
(so that it doesn't talk about trait upcasting stabilization in the
future tense)
We can't remove `TraitUpcasting` variant, since we need to use the index
in winnowing.
this commit makes `deref_into_dyn_supertrait` lint allow-by-default,
removes future incompatibility (we finally live in a broken world), and
changes the wording in the documentation.

previously documentation erroneously said that it lints against *usage*
of the deref impl, while it actually (since 104742) lints on the impl
itself (oooops, my oversight, should have updated it 2+ years ago...)
…treat, r=compiler-errors

Stabilize `feature(trait_upcasting)`

This feature was "done" for a while now, I think it's finally time to stabilize it! Stabilization report: rust-lang#134367 (comment).
cc reference PR: rust-lang/reference#1622.

Closes rust-lang#65991 (tracking issue), closes rust-lang#89460 (the lint is no longer future incompat).

r? compiler-errors
…ulacrum

Update toolstate maintainers

This updates the toolstate maintainers to more closely match who is still active.
…r-errors

Remove some unnecessary parens in `assert!` conditions

While working on rust-lang#122661, some of these started triggering our "unnecessary parens" lints due to a change in the `assert!` desugaring. A cursory search identified a few more. Some of these have been carried from before 1.0, were a bulk rename from the previous name of `assert!` left them in that state. I went and removed as many of these unnecessary parens as possible in order to have fewer annoyances in the future if we make the lint smarter.
…fication, r=Nadrieril

Pattern Migration 2024: try to suggest eliding redundant binding modifiers

This is based on rust-lang#136475. Only the last commit is new.

This is a simpler, more restrictive alternative to rust-lang#136496, meant to partially address rust-lang#136047. If a pattern can be migrated to Rust 2024 solely by removing redundant binding modifiers, this will make that suggestion; otherwise, it uses the old suggestion of making the pattern fully explicit.

Relevant tracking issue: rust-lang#131414

``@rustbot`` label A-diagnostics A-patterns A-edition-2024

r? ``@Nadrieril``
…affleLapkin

Fix suggestion for `dependency_on_unit_never_type_fallback` involving closures + format args expansions

fixes rust-lang#136562

r? wafflelapkin or reassign
Remove dead code from rustc_codegen_llvm and the LLVM wrapper

First step to clean up the LLVM wrapper: remove existing dead code.

Split out of rust-lang#135502

r? ``@Zalathar``
…piler-errors

replace one `.map_or(true, ...)` with `.is_none_or(...)`

Randomly found while going through some of my old branches.
@rustbot rustbot added PG-exploit-mitigations Project group: Exploit mitigations 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Feb 7, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Feb 7, 2025

📌 Commit b4c4913 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 Feb 7, 2025
@bors
Copy link
Contributor

bors commented Feb 7, 2025

⌛ Testing commit b4c4913 with merge a9e7b30...

@bors
Copy link
Contributor

bors commented Feb 7, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 7, 2025
@bors bors merged commit a9e7b30 into rust-lang:master Feb 7, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 7, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#134367 Stabilize feature(trait_upcasting) 240696120d51c91f7d85890ac609f56a59bb0166 (link)
#135940 Update toolstate maintainers 564fb1021754b5fcb52542baa698ffea2fb837b6 (link)
#135945 Remove some unnecessary parens in assert! conditions a36e42687105432382a6fe2bce6e88ba5b2785a6 (link)
#136577 Pattern Migration 2024: try to suggest eliding redundant bi… 78613f62abbf638cdf13d5b386a84e3db1cb7bac (link)
#136598 Fix suggestion for dependency_on_unit_never_type_fallback dfc80cf460b89d11743ea53521769d29e06ebc6d (link)
#136653 Remove dead code from rustc_codegen_llvm and the LLVM wrapp… 1be2c2d5f59786b7779a087b618fa2a98e4e16f8 (link)
#136664 replace one .map_or(true, ...) with .is_none_or(...) 8b05d08a19a63680bbf56abceacd7e4dd5248ab3 (link)

previous master: 64e06c0f55

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a9e7b30): 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.2% [0.2%, 0.2%] 1
Regressions ❌
(secondary)
0.3% [0.3%, 0.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.2% [0.2%, 0.2%] 1

Max RSS (memory usage)

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

Cycles

Results (secondary -2.0%)

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)
-2.0% [-2.0%, -2.0%] 1
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 779.143s -> 778.956s (-0.02%)
Artifact size: 329.04 MiB -> 329.06 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. PG-exploit-mitigations Project group: Exploit mitigations 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. 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.

10 participants