Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 8, 2025

Conversation

jackh726
Copy link
Member

@jackh726 jackh726 commented Aug 6, 2025

Originally written by @flodiebold

@rustbot
Copy link
Collaborator

rustbot commented Aug 6, 2025

r? @SparrowLii

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

@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 Aug 6, 2025
@compiler-errors
Copy link
Member

r=me after fixing the merge conflict

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

jackh726 commented Aug 6, 2025

@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented Aug 6, 2025

📌 Commit 6296ca3 has been approved by compiler-errors

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 Aug 6, 2025
@rust-log-analyzer

This comment has been minimized.

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

jackh726 commented Aug 6, 2025

@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented Aug 6, 2025

📌 Commit a8f6528 has been approved by compiler-errors

It is now in the queue for this repository.

Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 7, 2025
…=compiler-errors

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

Originally written by `@flodiebold`
Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 7, 2025
…=compiler-errors

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

Originally written by ``@flodiebold``
bors added a commit that referenced this pull request Aug 7, 2025
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
@@ -120,3 +123,19 @@ impl<CTX> HashStable<CTX> for InferConst {
}
}
}

impl<I: Interner> TypeFoldable<I> for InferConst {
Copy link
Contributor

@lcnr lcnr Aug 7, 2025

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

idk, no reason. Pushed.

Copy link
Member

@flodiebold flodiebold Aug 8, 2025

Choose a reason for hiding this comment

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

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

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

jackh726 commented Aug 7, 2025

@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented Aug 7, 2025

📌 Commit 0cb2c16 has been approved by compiler-errors

It is now in the queue for this repository.

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

jackh726 commented Aug 7, 2025

@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented Aug 7, 2025

📌 Commit 29799c2 has been approved by compiler-errors

It is now in the queue for this repository.

bors added a commit that referenced this pull request Aug 8, 2025
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
@bors bors merged commit 0d22b2e into rust-lang:master Aug 8, 2025
10 checks passed
@rustbot 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
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`
@@ -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)]
Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

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

8 participants