Skip to content

Conversation

@Kivooeo
Copy link
Member

@Kivooeo Kivooeo commented Dec 25, 2025

r? BoxyUwU

fixes #150354
fixes #150355

@rustbot
Copy link
Collaborator

rustbot commented Dec 25, 2025

Some changes occurred in rustc_ty_utils::consts.rs

cc @BoxyUwU

@rustbot rustbot added 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. labels Dec 25, 2025
@rustbot
Copy link
Collaborator

rustbot commented Dec 25, 2025

BoxyUwU is currently at their maximum review capacity.
They may take a while to respond.

@BoxyUwU BoxyUwU 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 Dec 25, 2025
@rust-cloud-vms rust-cloud-vms bot force-pushed the add-match-for-constkidn branch from 50f69e4 to 73aeea4 Compare December 25, 2025 20:30
@Kivooeo
Copy link
Member Author

Kivooeo commented Dec 25, 2025

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 25, 2025
Copy link
Member

@BoxyUwU BoxyUwU left a comment

Choose a reason for hiding this comment

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

In theory we ought to make the same change to the match arms for handling arays/slices/tuples. They're currently doing the same ty::Const::new_value(ct.to_value()) thing which they shouldn't be. I don't think it's possible to write a test case where this matters yet though (we would need mgca to have support for hir::ConstArgKind::Array/Tuple which it doesn't yet).

I feel like a more involved refactor could be nice. Specifically:

  • Stop handling Array/Slice/Tuple in destructure_const
  • Have all callers of destructure_const handle array/slice/tuples themselves by using the branches of the ValTree.
  • Rename destructure_const and ty::DestructuredConst to destructure_adt_const and ty::DestructuredAdtConst

Would you be interested in doing that? Can either do so in this PR or a future PR if you like. I'm happy to just merge this PR without the proposed refactoring if you prefer.

View changes since this review

@Kivooeo Kivooeo changed the title check what kind of const we have before creating it avoid recreating field_const vec Dec 26, 2025
@Kivooeo
Copy link
Member Author

Kivooeo commented Dec 26, 2025

Would you be interested in doing that?

sure, I'd be happy to look into this refactor in the follow up PRs

@rust-cloud-vms rust-cloud-vms bot force-pushed the add-match-for-constkidn branch from 73aeea4 to 0cb04a1 Compare December 26, 2025 12:33
@rust-cloud-vms rust-cloud-vms bot force-pushed the add-match-for-constkidn branch from 0cb04a1 to f711ba7 Compare December 26, 2025 12:57
Copy link
Member

@BoxyUwU BoxyUwU left a comment

Choose a reason for hiding this comment

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

@rust-cloud-vms rust-cloud-vms bot force-pushed the add-match-for-constkidn branch from f711ba7 to 517411f Compare December 26, 2025 13:13
@Kivooeo
Copy link
Member Author

Kivooeo commented Dec 26, 2025

seems like it should be very fine now

Copy link
Member

@BoxyUwU BoxyUwU left a comment

Choose a reason for hiding this comment

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

r=me once CI passes

View changes since this review

@Kivooeo
Copy link
Member Author

Kivooeo commented Dec 26, 2025

@bors r=BoxyUwU rollup

@bors
Copy link
Collaborator

bors commented Dec 26, 2025

📌 Commit 517411f has been approved by BoxyUwU

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 Dec 26, 2025
@bors
Copy link
Collaborator

bors commented Dec 26, 2025

⌛ Testing commit 517411f with merge 82dd3cb...

@bors
Copy link
Collaborator

bors commented Dec 26, 2025

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing 82dd3cb to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 26, 2025
@bors bors merged commit 82dd3cb into rust-lang:main Dec 26, 2025
12 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Dec 26, 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 8da80d3 (parent) -> 82dd3cb (this PR)

Test differences

Show 4 test diffs

Stage 1

  • [ui] tests/ui/const-generics/mgca/printing_valtrees_supports_non_values.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/const-generics/mgca/printing_valtrees_supports_non_values.rs: [missing] -> pass (J0)

Additionally, 2 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 82dd3cb008233bfe50ba6b8d6618e6bbd6054eb1 --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. x86_64-msvc-1: 9054.6s -> 8128.2s (-10.2%)
  2. dist-riscv64-linux: 4897.8s -> 5292.2s (+8.1%)
  3. x86_64-gnu-llvm-20-1: 3959.7s -> 4277.9s (+8.0%)
  4. dist-aarch64-apple: 6421.4s -> 6876.4s (+7.1%)
  5. aarch64-apple: 10141.0s -> 9429.5s (-7.0%)
  6. dist-i686-msvc: 8381.3s -> 7872.6s (-6.1%)
  7. dist-x86_64-apple: 6418.6s -> 6765.6s (+5.4%)
  8. dist-x86_64-musl: 7309.7s -> 7701.8s (+5.4%)
  9. dist-ohos-aarch64: 4427.7s -> 4190.7s (-5.4%)
  10. aarch64-gnu-llvm-20-1: 3270.7s -> 3442.8s (+5.3%)
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 (82dd3cb): 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 -6.8%)

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

Cycles

Results (primary 2.8%, secondary 4.7%)

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

mean range count
Regressions ❌
(primary)
2.8% [1.4%, 4.5%] 13
Regressions ❌
(secondary)
4.7% [2.8%, 7.5%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.8% [1.4%, 4.5%] 13

Binary size

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

Bootstrap: 483.256s -> 492.292s (1.87%)
Artifact size: 392.46 MiB -> 392.38 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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ICE expected ConstKind::Value, got UnevaluatedConst ICE expected ConstKind::Value, got N/#1

5 participants