Skip to content

Conversation

@mu001999
Copy link
Contributor

@mu001999 mu001999 commented Jan 4, 2026

Tracking issue: #132980

Fixes #133965
Fixes #150613

r? @BoxyUwU

@rustbot
Copy link
Collaborator

rustbot commented Jan 4, 2026

HIR ty lowering was modified

cc @fmease

@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 Jan 4, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 4, 2026

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

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

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.

thanks! this looks correct. just a couple small things

View changes since this review

@bors
Copy link
Collaborator

bors commented Jan 5, 2026

☔ The latest upstream changes (presumably #150603) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 5, 2026

☔ The latest upstream changes made this pull request unmergeable. Please resolve the merge conflicts.

@rustbot

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rustbot
Copy link
Collaborator

rustbot commented Jan 5, 2026

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rustbot rustbot added the T-clippy Relevant to the Clippy team. label Jan 5, 2026
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@BoxyUwU
Copy link
Member

BoxyUwU commented Jan 6, 2026

I think this ICE is fixed by #149254 and not your fault (i.e. your code looks correct to me). I'm not sure that PR is going to land though since the author is somewhat non responsive. We can either do a similar fix as part of this PR or go back to having your setup with three variants on FeedConstTy and in a followup PR we can cleanup the FeedConstTy abstraction. Up to you :)

I think we probably need to do some cleanup here regardless as its not really about query feeding anymore and there are some locations that use FeedConstTy::No that will cause us to not have an expected type for tuple elements 🤔

@mu001999
Copy link
Contributor Author

mu001999 commented Jan 6, 2026

I think this ICE is fixed by #149254

Oh it's true. I applied that change locally and test again, no ICE appears!

@mu001999
Copy link
Contributor Author

mu001999 commented Jan 6, 2026

We can either do a similar fix as part of this PR or go back to having your setup with three variants on FeedConstTy and in a followup PR we can cleanup the FeedConstTy abstraction.

I prefer the former ;)

@BoxyUwU
Copy link
Member

BoxyUwU commented Jan 6, 2026

In that case what that PR does is pretty much what we want, except I think it's fine to just use let parent_identity_args = ty::GenericArgs::identity_for_item(tcx, parent_def_id); and not do any of the extra fancy stuff to truncate the arguments to only non-forward-declared ones

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Jan 6, 2026

☔ The latest upstream changes (presumably #150726) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 6, 2026

☔ The latest upstream changes made this pull request unmergeable. Please resolve the merge conflicts.

@rustbot
Copy link
Collaborator

rustbot commented Jan 7, 2026

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.

@rust-log-analyzer

This comment has been minimized.

@mu001999
Copy link
Contributor Author

mu001999 commented Jan 7, 2026

@BoxyUwU CI passed, I think this PR is ready now

@BoxyUwU
Copy link
Member

BoxyUwU commented Jan 7, 2026

Yep! This looks great thank you for working on this :)

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 7, 2026

📌 Commit 6c2dc40 has been approved by BoxyUwU

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Jan 7, 2026

🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened.

@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 Jan 7, 2026
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 8, 2026
MGCA: Support tuple expressions as direct const arguments

Tracking issue: rust-lang#132980

Fixes rust-lang#133965
Fixes rust-lang#150613

r? @BoxyUwU
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 8, 2026
MGCA: Support tuple expressions as direct const arguments

Tracking issue: rust-lang#132980

Fixes rust-lang#133965
Fixes rust-lang#150613

r? @BoxyUwU
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 8, 2026
MGCA: Support tuple expressions as direct const arguments

Tracking issue: rust-lang#132980

Fixes rust-lang#133965
Fixes rust-lang#150613

r? @BoxyUwU
rust-bors bot added a commit that referenced this pull request Jan 8, 2026
Rollup of 6 pull requests

Successful merges:

 - #150675 (MGCA: Support tuple expressions as direct const arguments)
 - #150696 (enrich error info when tries to dlopen Enzyme)
 - #150747 (tests/ui/runtime/on-broken-pipe/with-rustc_main.rs: Not needed so remove)
 - #150757 (Fix `alloc_error_handler` signature mismatch)
 - #150777 (Stabilize `slice::element_offset`)
 - #150791 (Remove out of date FIXME comment.)

r? @ghost
@rust-bors rust-bors bot merged commit db2ab90 into rust-lang:main Jan 8, 2026
11 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Jan 8, 2026
rust-timer added a commit that referenced this pull request Jan 8, 2026
Rollup merge of #150675 - mgca/tuple-expr, r=BoxyUwU

MGCA: Support tuple expressions as direct const arguments

Tracking issue: #132980

Fixes #133965
Fixes #150613

r? @BoxyUwU
@mu001999 mu001999 deleted the mgca/tuple-expr branch January 8, 2026 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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. 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.

MGCA: Support tuple expressions as direct const arguments ICE: E0107 points into derived code

5 participants