Skip to content

internal: Migrate MIR to next solver#20814

Merged
ShoyuVanilla merged 1 commit into
rust-lang:masterfrom
ChayimFriedman2:mir-ns
Oct 11, 2025
Merged

internal: Migrate MIR to next solver#20814
ShoyuVanilla merged 1 commit into
rust-lang:masterfrom
ChayimFriedman2:mir-ns

Conversation

@ChayimFriedman2

Copy link
Copy Markdown
Contributor

No description provided.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 8, 2025

@flodiebold flodiebold left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

Comment thread crates/hir-ty/src/lib.rs

extern crate ra_ap_rustc_next_trait_solver as rustc_next_trait_solver;

extern crate self as hir_ty;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

what's this for?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The new macros crate, which I decided to introduce because the boilerplate was too much for my taste.

#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, TypeFoldable, TypeVisitable)]
pub struct ValueConst<'db> {
pub(crate) ty: Ty<'db>,
// FIXME: Should we ignore this for TypeVisitable, TypeFoldable?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

looks like rustc's ValTree simply has trivial impls?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure we should copy what it does, our consteval is quite different.

@ChayimFriedman2

Copy link
Copy Markdown
Contributor Author

The CI failure is due to the new implementation of Interner::impl_specializes. Of course we should add that (I'm still investigating it), but to focus in this PR on MIR I will revert this change.

@ShoyuVanilla ShoyuVanilla left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good to me, too (Looked into this before but waited due to specialization cycle thing 😅 )

@ShoyuVanilla ShoyuVanilla added this pull request to the merge queue Oct 11, 2025
Merged via the queue into rust-lang:master with commit 6fcd20b Oct 11, 2025
15 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 11, 2025
@ChayimFriedman2 ChayimFriedman2 deleted the mir-ns branch October 11, 2025 17:23
@lnicola

lnicola commented Oct 14, 2025

Copy link
Copy Markdown
Member

changelog fixup #20329

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants