Skip to content

Intern external constraints in new solver #107621

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Feb 4, 2023

Conversation

compiler-errors
Copy link
Member

Makes the query response Copy, fixing a few FIXMEs.

@rustbot
Copy link
Collaborator

rustbot commented Feb 3, 2023

r? @michaelwoerister

(rustbot has picked a reviewer for you, use r? to override)

@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 Feb 3, 2023
@rustbot
Copy link
Collaborator

rustbot commented Feb 3, 2023

Some changes occurred to the core trait solver

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

@compiler-errors compiler-errors force-pushed the intern-external-constraints branch from 18eb9f8 to eb67e26 Compare February 3, 2023 03:01
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

few nits, then r=me

@@ -0,0 +1,55 @@
use std::ops::ControlFlow;
Copy link
Contributor

Choose a reason for hiding this comment

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

please add this file to the auto notifs file for the initiative

@@ -437,18 +428,18 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
}

#[instrument(level = "debug", skip(infcx), ret)]
fn take_external_constraints<'tcx>(
fn take_and_intern_external_constraints<'tcx>(
Copy link
Contributor

Choose a reason for hiding this comment

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

i feel like the intern isn't too useful here as the exact way external constraints are stored is irrelevant for the caller 🤔

would keep the current name (or actually rename it to compute_external_query_constraints or sth)

@compiler-errors compiler-errors force-pushed the intern-external-constraints branch from eb67e26 to a41655d Compare February 3, 2023 21:36
@compiler-errors compiler-errors force-pushed the intern-external-constraints branch from a41655d to 41883fd Compare February 3, 2023 21:37
@rustbot rustbot added the A-meta Area: Issues & PRs about the rust-lang/rust repository itself label Feb 3, 2023
@compiler-errors
Copy link
Member Author

@bors r=lcnr rollup

@bors
Copy link
Collaborator

bors commented Feb 3, 2023

📌 Commit 41883fd has been approved by lcnr

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 Feb 3, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 3, 2023
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#106887 (Make const/fn return params more suggestable)
 - rust-lang#107519 (Add type alias for raw OS errors)
 - rust-lang#107551 ( Replace `ConstFnMutClosure` with const closures )
 - rust-lang#107595 (Retry opening proc-macro DLLs a few times on Windows.)
 - rust-lang#107615 (Replace nbsp in all rustdoc code blocks)
 - rust-lang#107621 (Intern external constraints in new solver)
 - rust-lang#107631 (loudly tell people when they change `Cargo.lock`)
 - rust-lang#107632 (Clarifying that .map() returns None if None.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 72599c6 into rust-lang:master Feb 4, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 4, 2023
@compiler-errors compiler-errors deleted the intern-external-constraints branch August 11, 2023 20:03
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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
Development

Successfully merging this pull request may close these issues.

5 participants