Skip to content

Conversation

@flip1995
Copy link
Member

profetia and others added 30 commits October 11, 2025 03:02
Their meanings, and the way they're handled in `get_attr`, are pretty
similar
- Move it and its helper function `parse_attrs` together to the end
  of the file, because it's surprising to see front-and-center a struct
  that's only really used in one place (`cognitive_complexity`).
- Avoid panic path in `LimitStack::limit`
- Replace `assert` with `debug_assert` to avoid panics in release builds
Now we don't touch, and thus don't break, whatever path `Rc`/`Arc` was
specified with
Move `unused_enumerate_index.rs` to `methods`.
Fix rust-lang/rust-clippy#14350

Co-authored-by: Timo <30553356+y21@users.noreply.github.com>
…dead

Constify trait aliases

Allow `const trait Foo = Bar + [const] Baz;` trait alias declarations. Their rules are the same as with super traits of const traits. So `[const] Baz` or `const Baz` is only required for `[const] Foo` or `const Foo` bounds respectively.

tracking issue rust-lang#41517 (part of the general trait alias feature gate, but I can split it out into a separate const trait alias feature gate. I just assumed that const traits would stabilize before trait aliases, and we'd want to stabilize trait aliases together with const trait aliases at the same time)

r? ``@compiler-errors`` ``@fee1-dead``
@bors
Copy link
Collaborator

bors commented Nov 15, 2025

📌 Commit 84af28b has been approved by Manishearth

It is now in the queue for this repository.

@flip1995
Copy link
Member Author

@bors p=0

Let's only bump priority once PR CI passes. This test is still failing for me locally for whatever reason.

@flip1995
Copy link
Member Author

@bors p=1 PR CI passed.

@bors
Copy link
Collaborator

bors commented Nov 15, 2025

⌛ Testing commit 84af28b with merge 0291100...

bors added a commit that referenced this pull request Nov 15, 2025
@madsmtm
Copy link
Contributor

madsmtm commented Nov 15, 2025

@madsmtm could you take a look at the Cargo.lock update here, please? A bit surprising that Clippy just added the tikv allocator in Cargo.lock 🤔

Probably some sort of race between #146627 and when it was reverted in #148896?

I'm unsure of how exactly Josh subtrees work, but in this PR's current state, I fear that merging this is gonna re-introduce the perf regression for Clippy, so:
@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 15, 2025
@bors
Copy link
Collaborator

bors commented Nov 15, 2025

☀️ Try build successful - checks-actions
Build commit: 0291100 (0291100d11327aa7f7500a03046e6fff90bbc5cb)

@RalfJung
Copy link
Member

Yeah this apparently changes the version of tikv-jemalloc-sys for everything in the rustc workspace. Why that?

termize = "0.2"
color-print = "0.3.4"
anstream = "0.6.18"
tikv-jemalloc-sys = { version = "0.6.1", optional = true, features = ['override_allocator_on_supported_platforms'] }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably not say 0.6.1. This is what forces the version bump for everything in the repo, and that's really not something we should do in a subtree sync PR.

Copy link
Member Author

@flip1995 flip1995 Nov 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I messed up when resolving conflicts. This was it. I left Cargo.toml untouched and reverted the Cargo.lock changes.

Shouldn't have done the sync at 1am...

@flip1995 flip1995 force-pushed the clippy-subtree-update branch from 84af28b to b006b3d Compare November 16, 2025 14:20
@flip1995
Copy link
Member Author

@bors r=Manishearth

@bors
Copy link
Collaborator

bors commented Nov 16, 2025

📌 Commit b006b3d has been approved by Manishearth

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 16, 2025
@bors
Copy link
Collaborator

bors commented Nov 16, 2025

⌛ Testing commit b006b3d with merge cc57d9a...

@bors
Copy link
Collaborator

bors commented Nov 16, 2025

☀️ Test successful - checks-actions
Approved by: Manishearth
Pushing cc57d9a to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 16, 2025
@bors bors merged commit cc57d9a into rust-lang:main Nov 16, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 16, 2025
@github-actions
Copy link
Contributor

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 e92ffc3 (parent) -> cc57d9a (this PR)

Test differences

Show 2 test diffs

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

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard cc57d9a2ab7f665dbf4c36c126188889bb47886a --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: 3923.1s -> 3434.8s (-12.4%)
  2. x86_64-gnu-gcc: 2769.4s -> 3086.0s (+11.4%)
  3. x86_64-gnu-aux: 6660.8s -> 5928.9s (-11.0%)
  4. i686-msvc-2: 7379.7s -> 8158.7s (+10.6%)
  5. x86_64-gnu-llvm-20: 2461.0s -> 2222.6s (-9.7%)
  6. aarch64-gnu-llvm-20-2: 2195.9s -> 2396.4s (+9.1%)
  7. x86_64-gnu: 7038.7s -> 6398.4s (-9.1%)
  8. x86_64-gnu-llvm-20-1: 3231.0s -> 2978.2s (-7.8%)
  9. pr-check-1: 1503.1s -> 1391.1s (-7.4%)
  10. dist-x86_64-mingw: 8656.1s -> 9281.6s (+7.2%)
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 (cc57d9a): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

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

Max RSS (memory usage)

Results (primary 0.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
3.8% [3.8%, 3.8%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.0% [-3.0%, -3.0%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.4% [-3.0%, 3.8%] 2

Cycles

Results (primary 2.5%, secondary -3.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

Binary size

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

Bootstrap: 470.813s -> 473.602s (0.59%)
Artifact size: 388.74 MiB -> 388.70 MiB (-0.01%)

Muscraft pushed a commit to Muscraft/rust that referenced this pull request Nov 17, 2025
…nishearth

Clippy subtree update

r? `@Manishearth`
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. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-clippy Relevant to the Clippy team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.