Skip to content
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.

Sign up for GitHub

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

Jump to bottom

NormalizesTo: return nested goals to caller #122687

Merged
merged 5 commits into from
Mar 18, 2024
Merged

NormalizesTo: return nested goals to caller #122687

merged 5 commits into from
Mar 18, 2024

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Mar 18, 2024

Fixes the regression of paperclip-core. see https://hackmd.io/IsVAafiOTAaPIFcUxRJufw for more details.

r? @compiler-errors

@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Mar 18, 2024
@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 2024

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lcnr lcnr force-pushed the normalizes-to-emit-nested-goals branch from 1ae8d1d to f26e1e8 Compare March 18, 2024 14:53
@lcnr lcnr force-pushed the normalizes-to-emit-nested-goals branch from b01097f to 70c52a4 Compare March 18, 2024 16:00
@BoxyUwU
Copy link
Member

BoxyUwU commented Mar 18, 2024 •
edited
Loading

if we never evaluate goals inside of normalizes-to are we able to make normalizes-to a tcx query since we don't actually care about whatever goals are in the search graph for evaluating it? I imagine it would probably suck, we still use the whole candidate assembly machinery so. ?? there would be no real point

@lcnr
Copy link
Contributor Author

lcnr commented Mar 18, 2024 •
edited
Loading

if we never evaluate goals inside of normalizes-to are we able to make normalizes-to a tcx query since we don't actually care about whatever goals are in the search graph for evaluating it? I imagine it would probably suck, we still use the whole candidate assembly machinery so. ?? there would be no real point

we still have to evaluate goals inside of normalizes-to to drop candidates which don't hold due to their nested goals

lqd
lqd reviewed Mar 18, 2024
View reviewed changes
Copy link
Member

@lqd lqd left a comment

Choose a reason for hiding this comment

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

High-value review comments™

compiler/rustc_type_ir/src/predicate_kind.rs Outdated Show resolved Hide resolved
compiler/rustc_type_ir/src/predicate_kind.rs Outdated Show resolved Hide resolved
@lcnr lcnr force-pushed the normalizes-to-emit-nested-goals branch from 70c52a4 to 0b29b71 Compare March 18, 2024 17:13
@compiler-errors
Copy link
Member

@bors r+ rollup (new solver)

@bors
Copy link
Contributor

bors commented Mar 18, 2024

📌 Commit 0b29b71 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 Mar 18, 2024
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Mar 18, 2024
@workingjubilee
Rollup merge of rust-lang#122687 - lcnr:normalizes-to-emit-nested-goa…
d0e534c 
…ls, r=compiler-errors

`NormalizesTo`: return nested goals to caller

Fixes the regression of `paperclip-core`. see https://hackmd.io/IsVAafiOTAaPIFcUxRJufw for more details.

r? `@compiler-errors`
@workingjubilee workingjubilee mentioned this pull request Mar 18, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 18, 2024
@matthiaskrgr
Rollup merge of rust-lang#122687 - lcnr:normalizes-to-emit-nested-goa…
befcfb7 
…ls, r=compiler-errors

`NormalizesTo`: return nested goals to caller

Fixes the regression of `paperclip-core`. see https://hackmd.io/IsVAafiOTAaPIFcUxRJufw for more details.

r? ``@compiler-errors``
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 18, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2024
@bors
Auto merge of rust-lang#122712 - matthiaskrgr:rollup-xup9a3i, r=matth…
f97cbaf 
…iaskrgr

Rollup of 12 pull requests

Successful merges:

 - rust-lang#121258 (Reject overly generic assoc const binding types)
 - rust-lang#121823 (never patterns: suggest `!` patterns on non-exhaustive matches)
 - rust-lang#122060 (Stabilize `imported_main`)
 - rust-lang#122158 (Provide structured suggestion for `#![feature(foo)]`)
 - rust-lang#122642 (Improve wording of `Vec::swap_remove`)
 - rust-lang#122675 (core: document default attribute stabilization)
 - rust-lang#122687 (`NormalizesTo`: return nested goals to caller)
 - rust-lang#122691 (Fix ICE: `global_asm!()` Don't Panic When Unable to Evaluate Constant)
 - rust-lang#122693 (Fix heading anchors in doc pages.)
 - rust-lang#122699 (Fix a typo in the 1.77.0 relnotes)
 - rust-lang#122700 (Remove redundant files, rename base riscv32 file)
 - rust-lang#122701 (Detect allocator for box in `must_not_suspend` lint)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 18, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2024
@bors
Auto merge of rust-lang#122713 - matthiaskrgr:rollup-81grkpm, r=matth…
3c85e56 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#121258 (Reject overly generic assoc const binding types)
 - rust-lang#121823 (never patterns: suggest `!` patterns on non-exhaustive matches)
 - rust-lang#122060 (Stabilize `imported_main`)
 - rust-lang#122158 (Provide structured suggestion for `#![feature(foo)]`)
 - rust-lang#122642 (Improve wording of `Vec::swap_remove`)
 - rust-lang#122675 (core: document default attribute stabilization)
 - rust-lang#122687 (`NormalizesTo`: return nested goals to caller)
 - rust-lang#122693 (Fix heading anchors in doc pages.)
 - rust-lang#122699 (Fix a typo in the 1.77.0 relnotes)
 - rust-lang#122700 (Remove redundant files, rename base riscv32 file)
 - rust-lang#122701 (Detect allocator for box in `must_not_suspend` lint)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e906205 into rust-lang:master Mar 18, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Mar 18, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2024
@rust-timer
Unrolled build for rust-lang#122687
d291299 
Rollup merge of rust-lang#122687 - lcnr:normalizes-to-emit-nested-goals, r=compiler-errors

`NormalizesTo`: return nested goals to caller

Fixes the regression of `paperclip-core`. see https://hackmd.io/IsVAafiOTAaPIFcUxRJufw for more details.

r? ```@compiler-errors```
@lcnr lcnr deleted the normalizes-to-emit-nested-goals branch March 19, 2024 09:45
@oli-obk oli-obk mentioned this pull request Mar 20, 2024
Merged
1 task
@lcnr lcnr mentioned this pull request Mar 21, 2024
Merged
@lqd lqd mentioned this pull request Apr 8, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lqd lqd lqd left review comments

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.
7 participants
@lcnr @rustbot @rust-log-analyzer @BoxyUwU @compiler-errors @bors @lqd