A couple small changes for rust-analyzer next-solver work #145009

jackh726 · 2025-08-06T15:24:21Z

Originally written by @flodiebold

rustbot · 2025-08-06T15:24:30Z

rustbot has assigned @SparrowLii.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

compiler-errors · 2025-08-06T16:24:09Z

r=me after fixing the merge conflict

jackh726 · 2025-08-06T18:37:30Z

@bors r=compiler-errors

bors · 2025-08-06T18:37:33Z

📌 Commit 6296ca3 has been approved by compiler-errors

It is now in the queue for this repository.

jackh726 · 2025-08-06T20:20:23Z

@bors r=compiler-errors

bors · 2025-08-06T20:20:26Z

📌 Commit a8f6528 has been approved by compiler-errors

It is now in the queue for this repository.

…=compiler-errors A couple small changes for rust-analyzer next-solver work Originally written by `@flodiebold`

…=compiler-errors A couple small changes for rust-analyzer next-solver work Originally written by ``@flodiebold``

Rollup of 20 pull requests Successful merges: - #137831 (Tweak auto trait errors) - #143028 (emit `StorageLive` and schedule `StorageDead` for `let`-`else`'s bindings after matching) - #143764 (lower pattern bindings in the order they're written and base drop order on primary bindings' order) - #143808 (Port `#[should_panic]` to the new attribute parsing infrastructure ) - #143906 (Miri: non-deterministic floating point operations in `foreign_items`) - #143929 (Mark all deprecation lints in name resolution as deny-by-default and report-in-deps) - #144133 (Stabilize const TypeId::of) - #144439 (Introduce ModernIdent type to unify macro 2.0 hygiene handling) - #144473 (Address libunwind.a inconsistency issues in the bootstrap program) - #144659 (bootstrap: refactor mingw dist and fix gnullvm) - #144705 (compiler-builtins: plumb LSE support for aarch64 on linux/gnu when optimized-compiler-builtins not enabled) - #144807 (Streamline config in bootstrap) - #144900 (Stabilize `unsigned_signed_diff` feature) - #144903 (Rename `begin_panic_handler` to `panic_handler`) - #144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - #144974 (compiler-builtins subtree update) - #144997 (bump bootstrap compiler to 1.90 beta) - #145004 (Couple of minor cleanups) - #145009 (A couple small changes for rust-analyzer next-solver work) - #145014 (Revert "Preserve the .debug_gdb_scripts section") r? `@ghost` `@rustbot` modify labels: rollup

lcnr · 2025-08-07T07:52:42Z

compiler/rustc_type_ir/src/const_kind.rs

@@ -120,3 +123,19 @@ impl<CTX> HashStable<CTX> for InferConst {
        }
    }
 }
+
+impl<I: Interner> TypeFoldable<I> for InferConst {


why does this have to be TypeFoldable instead of using #[type_foldable(identity)] and `#[type_visitable(ignore)]?

idk, no reason. Pushed.

IIRC I was just moving impls from other places in the compiler originally, maybe this got refactored afterwards

jackh726 · 2025-08-07T15:13:24Z

@bors r=compiler-errors

bors · 2025-08-07T15:13:27Z

📌 Commit 0cb2c16 has been approved by compiler-errors

It is now in the queue for this repository.

jackh726 · 2025-08-07T15:16:52Z

@bors r=compiler-errors

bors · 2025-08-07T15:16:56Z

📌 Commit 29799c2 has been approved by compiler-errors

It is now in the queue for this repository.

Rollup of 19 pull requests Successful merges: - #144400 (`tests/ui/issues/`: The Issues Strike Back [3/N]) - #144764 ([codegen] assume the tag, not the relative discriminant) - #144807 (Streamline config in bootstrap) - #144899 (Print CGU reuse statistics in `-Zprint-mono-items`) - #144909 (Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information) - #144912 (Resolver: introduce a conditionally mutable Resolver for (non-)speculative resolution.) - #144914 (Add support for `ty::Instance` path shortening in diagnostics) - #144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - #144999 (coverage: Remove all unstable support for MC/DC instrumentation) - #145009 (A couple small changes for rust-analyzer next-solver work) - #145030 (GVN: Do not flatten derefs with ProjectionElem::Index. ) - #145042 (stdarch subtree update) - #145047 (move `type_check` out of `compute_regions`) - #145051 (Prevent name collisions with internal implementation details) - #145053 (Add a lot of NLL `known-bug` tests) - #145055 (Move metadata symbol export from exported_non_generic_symbols to exported_symbols) - #145057 (Clean up some resolved test regressions of const trait removals in std) - #145068 (Readd myself to review queue) - #145070 (Add minimal `armv7a-vex-v5` tier three target) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #145009 - jackh726:ra-next-solver-changes, r=compiler-errors A couple small changes for rust-analyzer next-solver work Originally written by `@flodiebold`

lcnr · 2025-08-08T11:43:35Z

compiler/rustc_type_ir/src/const_kind.rs

@@ -92,10 +92,15 @@ rustc_index::newtype_index! {

 /// An inference variable for a const, for use in const generics.
 #[derive(Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Hash)]
+#[derive(TypeVisitable_Generic, TypeFoldable_Generic)]


wait... the same thing here, this should also be ignored by visitable impls

Rollup of 19 pull requests Successful merges: - rust-lang/rust#144400 (`tests/ui/issues/`: The Issues Strike Back [3/N]) - rust-lang/rust#144764 ([codegen] assume the tag, not the relative discriminant) - rust-lang/rust#144807 (Streamline config in bootstrap) - rust-lang/rust#144899 (Print CGU reuse statistics in `-Zprint-mono-items`) - rust-lang/rust#144909 (Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information) - rust-lang/rust#144912 (Resolver: introduce a conditionally mutable Resolver for (non-)speculative resolution.) - rust-lang/rust#144914 (Add support for `ty::Instance` path shortening in diagnostics) - rust-lang/rust#144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - rust-lang/rust#144999 (coverage: Remove all unstable support for MC/DC instrumentation) - rust-lang/rust#145009 (A couple small changes for rust-analyzer next-solver work) - rust-lang/rust#145030 (GVN: Do not flatten derefs with ProjectionElem::Index. ) - rust-lang/rust#145042 (stdarch subtree update) - rust-lang/rust#145047 (move `type_check` out of `compute_regions`) - rust-lang/rust#145051 (Prevent name collisions with internal implementation details) - rust-lang/rust#145053 (Add a lot of NLL `known-bug` tests) - rust-lang/rust#145055 (Move metadata symbol export from exported_non_generic_symbols to exported_symbols) - rust-lang/rust#145057 (Clean up some resolved test regressions of const trait removals in std) - rust-lang/rust#145068 (Readd myself to review queue) - rust-lang/rust#145070 (Add minimal `armv7a-vex-v5` tier three target) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 19 pull requests Successful merges: - rust-lang#144400 (`tests/ui/issues/`: The Issues Strike Back [3/N]) - rust-lang#144764 ([codegen] assume the tag, not the relative discriminant) - rust-lang#144807 (Streamline config in bootstrap) - rust-lang#144899 (Print CGU reuse statistics in `-Zprint-mono-items`) - rust-lang#144909 (Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information) - rust-lang#144912 (Resolver: introduce a conditionally mutable Resolver for (non-)speculative resolution.) - rust-lang#144914 (Add support for `ty::Instance` path shortening in diagnostics) - rust-lang#144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - rust-lang#144999 (coverage: Remove all unstable support for MC/DC instrumentation) - rust-lang#145009 (A couple small changes for rust-analyzer next-solver work) - rust-lang#145030 (GVN: Do not flatten derefs with ProjectionElem::Index. ) - rust-lang#145042 (stdarch subtree update) - rust-lang#145047 (move `type_check` out of `compute_regions`) - rust-lang#145051 (Prevent name collisions with internal implementation details) - rust-lang#145053 (Add a lot of NLL `known-bug` tests) - rust-lang#145055 (Move metadata symbol export from exported_non_generic_symbols to exported_symbols) - rust-lang#145057 (Clean up some resolved test regressions of const trait removals in std) - rust-lang#145068 (Readd myself to review queue) - rust-lang#145070 (Add minimal `armv7a-vex-v5` tier three target) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 19 pull requests Successful merges: - rust-lang/rust#144400 (`tests/ui/issues/`: The Issues Strike Back [3/N]) - rust-lang/rust#144764 ([codegen] assume the tag, not the relative discriminant) - rust-lang/rust#144807 (Streamline config in bootstrap) - rust-lang/rust#144899 (Print CGU reuse statistics in `-Zprint-mono-items`) - rust-lang/rust#144909 (Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information) - rust-lang/rust#144912 (Resolver: introduce a conditionally mutable Resolver for (non-)speculative resolution.) - rust-lang/rust#144914 (Add support for `ty::Instance` path shortening in diagnostics) - rust-lang/rust#144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - rust-lang/rust#144999 (coverage: Remove all unstable support for MC/DC instrumentation) - rust-lang/rust#145009 (A couple small changes for rust-analyzer next-solver work) - rust-lang/rust#145030 (GVN: Do not flatten derefs with ProjectionElem::Index. ) - rust-lang/rust#145042 (stdarch subtree update) - rust-lang/rust#145047 (move `type_check` out of `compute_regions`) - rust-lang/rust#145051 (Prevent name collisions with internal implementation details) - rust-lang/rust#145053 (Add a lot of NLL `known-bug` tests) - rust-lang/rust#145055 (Move metadata symbol export from exported_non_generic_symbols to exported_symbols) - rust-lang/rust#145057 (Clean up some resolved test regressions of const trait removals in std) - rust-lang/rust#145068 (Readd myself to review queue) - rust-lang/rust#145070 (Add minimal `armv7a-vex-v5` tier three target) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned SparrowLii Aug 6, 2025

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 Aug 6, 2025

compiler-errors approved these changes Aug 6, 2025

View reviewed changes

compiler-errors assigned compiler-errors and unassigned SparrowLii Aug 6, 2025

Move some TypeVisitable/TypeFoldable impls to rustc_type_ir

4ff22dd

rust-cloud-vms bot force-pushed the ra-next-solver-changes branch from e9b6d66 to 6296ca3 Compare August 6, 2025 18:36

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 Aug 6, 2025

This comment has been minimized.

Sign in to view

rust-cloud-vms bot force-pushed the ra-next-solver-changes branch from 6296ca3 to a8f6528 Compare August 6, 2025 19:43

Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 7, 2025

Rollup merge of rust-lang#145009 - jackh726:ra-next-solver-changes, r…

63ca855

…=compiler-errors A couple small changes for rust-analyzer next-solver work Originally written by `@flodiebold`

Zalathar mentioned this pull request Aug 7, 2025

Rollup of 21 pull requests #145034

Closed

Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 7, 2025

Rollup merge of rust-lang#145009 - jackh726:ra-next-solver-changes, r…

bc3a3a5

…=compiler-errors A couple small changes for rust-analyzer next-solver work Originally written by ``@flodiebold``

Zalathar mentioned this pull request Aug 7, 2025

Rollup of 20 pull requests #145039

Closed

lcnr reviewed Aug 7, 2025

View reviewed changes

rust-cloud-vms bot force-pushed the ra-next-solver-changes branch from a8f6528 to 0cb2c16 Compare August 7, 2025 15:13

Add a missing UpcastFrom impl in rustc_type_ir

29799c2

rust-cloud-vms bot force-pushed the ra-next-solver-changes branch from 0cb2c16 to 29799c2 Compare August 7, 2025 15:16

Zalathar mentioned this pull request Aug 8, 2025

Rollup of 19 pull requests #145077

Merged

bors merged commit 0d22b2e into rust-lang:master Aug 8, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 8, 2025

rust-timer added a commit that referenced this pull request Aug 8, 2025

Unrolled build for #145009

8f23ada

Rollup merge of #145009 - jackh726:ra-next-solver-changes, r=compiler-errors A couple small changes for rust-analyzer next-solver work Originally written by `@flodiebold`

lcnr reviewed Aug 8, 2025

View reviewed changes

jackh726 deleted the ra-next-solver-changes branch August 8, 2025 15:42

A couple small changes for rust-analyzer next-solver work #145009

A couple small changes for rust-analyzer next-solver work #145009

Uh oh!

Conversation

jackh726 commented Aug 6, 2025

Uh oh!

rustbot commented Aug 6, 2025

Uh oh!

compiler-errors commented Aug 6, 2025

Uh oh!

jackh726 commented Aug 6, 2025

Uh oh!

bors commented Aug 6, 2025

Uh oh!

This comment has been minimized.

jackh726 commented Aug 6, 2025

Uh oh!

bors commented Aug 6, 2025

Uh oh!

lcnr Aug 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jackh726 Aug 7, 2025

Choose a reason for hiding this comment

Uh oh!

flodiebold Aug 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jackh726 commented Aug 7, 2025

Uh oh!

bors commented Aug 7, 2025

Uh oh!

jackh726 commented Aug 7, 2025

Uh oh!

bors commented Aug 7, 2025

Uh oh!

Uh oh!

lcnr Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

lcnr Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lcnr Aug 7, 2025 •

edited

Loading

flodiebold Aug 8, 2025 •

edited

Loading