Skip to content

Conversation

@flip1995
Copy link
Member

@flip1995 flip1995 commented Jan 8, 2026

r? Manishearth

Cargo.lock update due to askama bump to be in line with the Rust repo.

profetia and others added 30 commits November 29, 2025 22:28
changelog: [`transmuting_null`]: now checks single expression const blocks and blocks
This fixes the ICE reported by rejecting `const` blocks in
pattern position during AST lowering.

Previously, `ExprKind::ConstBlock` could reach HIR as `PatExprKind::ConstBlock`,
allowing invalid patterns to be type-checked and triggering an ICE.
This patch removes the lowering path for const blocks in patterns
and emits a proper diagnostic instead.

A new UI test is added to ensure the compiler reports a regular error
and to prevent regressions.
rust-lang/rust-clippy#16224

changelog: [`double_parens`]: fix FP on macro repetition patterns
Closes rust-lang/rust-clippy#16293

Also contains fixes of several other lints, on handling macros

changelog: [`checked_conversions`] fix wrongly unmangled macros
changelog: [`manual_ignore_case_cmp`] fix wrongly unmangled macros
changelog: [`manual_ilog2`] fix wrongly unmangled macros
changelog: [`needless_bool_assign`] fix wrongly unmangled macros
changelog: [`manual_is_multiple_of`] fix wrongly unmangled macros
Fairly simple and self explanatory, the actual config value is
`allowed-duplicate-crates` not `allowed_duplicate_crates` and will throw
an error if you use the wrong one.

changelog: Fix typoed mention of config value using `_` of `-`
…8, r=dianne

Fix ICE by rejecting const blocks in patterns during AST lowering (closes rust-lang#148138)

This PR fixes the ICE reported in rust-lang#148138.

The root cause is that `const` blocks aren’t allowed in pattern position, but the AST lowering logic still attempted to create `PatExprKind::ConstBlock`, allowing invalid HIR to reach type checking and trigger a `span_bug!`.

Following the discussion in the issue, this patch removes the `ConstBlock` lowering path from `lower_expr_within_pat`. Any `ExprKind::ConstBlock` inside a pattern is now handled consistently with other invalid pattern expressions.

A new UI test is included to ensure the compiler reports a proper error and to prevent regressions.

Closes rust-lang#148138.
The original documentation had me confused for a couple of minutes. Now
it should be more or less unambiguous.

changelog: none
…lang#16084)

Closes rust-lang/rust-clippy#14989

changelog: [`redundant_pattern_matching`] fix missing `)` in suggestion
span
Extremely small change, -0.018% performance improvement on `tokio`
Just some warmup for continuing on larger optimizations (i.e.
`nonminimal_bool`)

changelog:Remove allocations via String pre-allocating.
This removes another single allocation (namely by writing into an
already existing `String` instead of allocating a new one just to
`push_str` it).

r? @blyxyas

---

changelog: none
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 8, 2026

💔 Test for c9f505d failed: CI. Failed jobs:

@rust-log-analyzer

This comment has been minimized.

Closes rust-lang/rust-clippy#16351

changelog: [`unnecessary_to_owned`] fix wrongly unmangled macros
@rust-bors rust-bors bot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 9, 2026
@rust-bors

This comment was marked as outdated.

@flip1995 flip1995 force-pushed the clippy-subtree-update branch from fc94dfc to d283798 Compare January 9, 2026 09:39
@rustbot

This comment was marked as outdated.

@rustbot

This comment was marked as off-topic.

@rust-log-analyzer

This comment has been minimized.

@samueltardieu
Copy link
Member

Darn, the MGCA literals support has been merged in the meantime!

@samueltardieu
Copy link
Member

I'm testing https://github.com/samueltardieu/rust/tree/clippy-subtree-update with an updated version of my ConstArgKind commit to accomodate changes made in r-l/rust.

@samueltardieu
Copy link
Member

@flip1995 I think you can replace my penultimate commit by the one from https://github.com/samueltardieu/rust/tree/clippy-subtree-update (1dd7896).

@flip1995
Copy link
Member Author

flip1995 commented Jan 9, 2026

Ah thanks, didn't see your message until I fixed it myself.

@samueltardieu
Copy link
Member

pr-check-2 is now green

@bors r=Manishearth,samueltardieu p=1 rollup=never

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 9, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 9, 2026

📌 Commit 330358a has been approved by Manishearth,samueltardieu

It is now in the queue for this repository.

@rust-bors

This comment has been minimized.

@rust-bors rust-bors bot added the merged-by-bors This PR was explicitly merged by bors. label Jan 10, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 10, 2026

☀️ Test successful - CI
Approved by: Manishearth,samueltardieu
Pushing 1191620 to main...

@rust-bors rust-bors bot merged commit 1191620 into rust-lang:main Jan 10, 2026
12 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Jan 10, 2026
@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 a3f2d5a (parent) -> 1191620 (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 1191620b8c4a93074796408afa538e086acf38c7 --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-x86_64-apple: 8181.4s -> 6303.2s (-23.0%)
  2. aarch64-apple: 10384.8s -> 8395.8s (-19.2%)
  3. dist-aarch64-llvm-mingw: 6829.9s -> 5615.1s (-17.8%)
  4. dist-aarch64-apple: 7404.4s -> 6182.1s (-16.5%)
  5. dist-sparcv9-solaris: 5576.2s -> 4880.5s (-12.5%)
  6. dist-aarch64-msvc: 6722.5s -> 6069.4s (-9.7%)
  7. i686-gnu-2: 4914.4s -> 5362.8s (+9.1%)
  8. x86_64-msvc-ext1: 7785.0s -> 7091.0s (-8.9%)
  9. aarch64-msvc-1: 7418.6s -> 6801.0s (-8.3%)
  10. x86_64-msvc-ext3: 6855.1s -> 6308.0s (-8.0%)
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 (1191620): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary 2.1%)

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

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

Cycles

Results (primary 2.0%, secondary 0.1%)

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

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

Binary size

Results (secondary -0.1%)

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

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.1% [-0.1%, -0.0%] 8
All ❌✅ (primary) - - 0

Bootstrap: 473.694s -> 472.536s (-0.24%)
Artifact size: 391.30 MiB -> 391.23 MiB (-0.02%)

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.