refactor `destructure_const` #150411

Kivooeo · 2025-12-26T23:08:57Z

r? BoxyUwU

as you suggested yesterday (will add more context like links when it stops being a draft)

tried to split this into some meaningful commits hope it help ^^

rustbot · 2025-12-26T23:09:02Z

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

compiler/rustc_middle/src/ty/print/pretty.rs

compiler/rustc_ty_utils/src/consts.rs

compiler/rustc_middle/src/ty/mod.rs

compiler/rustc_middle/src/mir/pretty.rs

BoxyUwU · 2025-12-27T00:14:32Z

btw dont worry about the commit history- I expect this PR is simple enough that just one is fine. thanks for splitting it up nicely though :-)

Kivooeo · 2025-12-27T15:42:24Z

oh no i forget about semicolon

Kivooeo · 2025-12-27T16:31:09Z

seems like it also fixes #131052?

BoxyUwU

Can you squash all these commits then undraft the PR? I think its basically done after these reviews. I just want to spend a bit of time thinking over why this fixed that ICE but I don't expect that to take me long

View changes since this review

compiler/rustc_middle/src/ty/print/pretty.rs

compiler/rustc_symbol_mangling/src/v0.rs

compiler/rustc_middle/src/ty/print/pretty.rs

Kivooeo · 2025-12-27T22:55:09Z

Can you squash all these commits then undraft the PR?

yeah, this commits are only for while it's draft

Kivooeo · 2025-12-27T23:17:29Z

hopefully i didnt mess with commits

BoxyUwU · 2025-12-28T00:37:14Z

compiler/rustc_middle/src/ty/print/pretty.rs

+            }
+            (ty::ValTreeKind::Branch(fields), ty::Adt(def, args)) => {
+                let contents = cv.destructure_adt_const();
+                let fields = fields.iter().copied();


using fields here is wrong as it has more stuff in it than contents' fields

rustbot · 2025-12-28T12:57:08Z

This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.

Some changes occurred in rustc_ty_utils::consts.rs

cc @BoxyUwU

BoxyUwU · 2025-12-28T15:58:38Z

pls squash commits and look at the two leftover reviews, thx

rustbot · 2025-12-28T16:10:55Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

BoxyUwU · 2025-12-28T20:33:37Z

tests/ui/const-generics/adt_const_params/mismatch-raw-ptr-in-adt.rs

@@ -0,0 +1,13 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/131052>


I think what's happened here is that we're now masking an ICE that was originally caused by lit_to_const returning ValTree's with incorrect types 🤔 I can't think of a way to write a test that exposes that underlying brokenness so I think this is fine.

It would be nice to fix the underlying brokenness regardless. Would you be interested in doing that? The short explanation is that we lit_to_const for byte strings doesn't check that the type of the parameter the byte string is an argument to, is &[u8] is only checks if its a reference to a slice.

BoxyUwU · 2025-12-28T20:34:03Z

@bors r+ rollup

thanks for the PR ✨

bors · 2025-12-28T20:34:06Z

📌 Commit b29cc98 has been approved by BoxyUwU

It is now in the queue for this repository.

Kivooeo · 2025-12-28T20:36:08Z

i also was wondering, during this i've seen a lot of FIXME(mgca) and some of them seemed pretty solvable, at least at a first glance, would this be reasonable to try to solve them, or it'd be better to ask you first?

Kivooeo · 2025-12-28T20:36:53Z

Would you be interested in doing that?

yeah i guess i could take a look potentially, around next few days maybe

BoxyUwU · 2025-12-28T20:51:17Z

i also was wondering, during this i've seen a lot of FIXME(mgca) and some of them seemed pretty solvable, at least at a first glance, would this be reasonable to try to solve them, or it'd be better to ask you first?

some of them are probably a lot harder than others. if you ask me first I can tell you whether it's likely to be a huge pain or relatively simple :) in general though help with mgca is much appreciated

refactor `destructure_const` r? BoxyUwU as you suggested yesterday (will add more context like links when it stops being a draft) tried to split this into some meaningful commits hope it help ^^

…uwer Rollup of 8 pull requests Successful merges: - #148321 (parser/lexer: bump to Unicode 17, use faster unicode-ident) - #149540 (std: sys: fs: uefi: Implement readdir) - #149582 (Implement `Duration::div_duration_{floor,ceil}`) - #149663 (Optimized implementation for uN::{gather,scatter}_bits) - #149667 (Fix ICE by rejecting const blocks in patterns during AST lowering (closes #148138)) - #149947 (add several older crashtests) - #150011 (Add more `unbounded_sh[lr]` examples) - #150411 (refactor `destructure_const`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #150411 - Kivooeo:somefunnystuff, r=BoxyUwU refactor `destructure_const` r? BoxyUwU as you suggested yesterday (will add more context like links when it stops being a draft) tried to split this into some meaningful commits hope it help ^^

rustbot assigned BoxyUwU Dec 26, 2025

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 26, 2025

Kivooeo commented Dec 26, 2025

View reviewed changes

compiler/rustc_middle/src/ty/print/pretty.rs Outdated Show resolved Hide resolved