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.

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

Remove some stale FIXMEs in new solver #109580

Merged
merged 1 commit into from
Mar 27, 2023

Conversation

compiler-errors
Copy link
Member

Some FIXMEs are no longer needed

@rustbot
Copy link
Collaborator

rustbot commented Mar 25, 2023

r? @WaffleLapkin

(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 Mar 25, 2023
@rustbot
Copy link
Collaborator

rustbot commented Mar 25, 2023

Some changes occurred to the core trait solver

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

@@ -105,8 +103,6 @@ impl<'a, 'tcx> EvalCtxt<'a, 'tcx> {
goal: Goal<'tcx, SubtypePredicate<'tcx>>,
) -> QueryResult<'tcx> {
if goal.predicate.a.is_ty_var() && goal.predicate.b.is_ty_var() {
// FIXME: Do we want to register a subtype relation between these vars?
Copy link
Member Author

Choose a reason for hiding this comment

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

this makes no sense lol

@@ -9,8 +9,6 @@
//! FIXME(@lcnr): Write that section. If you read this before then ask me
//! about it on zulip.

// FIXME: uses of `infcx.at` need to enable deferred projection equality once that's implemented.
Copy link
Member Author

Choose a reason for hiding this comment

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

We already do this :)

@@ -78,8 +78,6 @@ impl<'tcx> SearchGraph<'tcx> {
tcx: TyCtxt<'tcx>,
goal: CanonicalGoal<'tcx>,
) -> Result<(), QueryResult<'tcx>> {
// FIXME: start by checking the global cache
Copy link
Member Author

Choose a reason for hiding this comment

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

We check the global cache in the parent caller

@lcnr
Copy link
Contributor

lcnr commented Mar 27, 2023

@bors r+ rollup

r? @lcnr

@bors
Copy link
Contributor

bors commented Mar 27, 2023

📌 Commit 53ec4bc has been approved by lcnr

It is now in the queue for this repository.

@rustbot rustbot assigned lcnr and unassigned WaffleLapkin Mar 27, 2023
@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 27, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#108625 (More config.toml.example cleanups)
 - rust-lang#109418 (Rename 'src/bootstrap/native.rs' to llvm.rs)
 - rust-lang#109580 (Remove some stale FIXMEs in new solver)
 - rust-lang#109582 (Refactor: Separate `LocalRef` variant for not-evaluated-yet operands)
 - rust-lang#109650 (Remove Nilstrieb from review rotation)
 - rust-lang#109656 (Update cargo)
 - rust-lang#109658 (Backport 1.68.1 and 1.68.2 release notes to `master`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9c73bf9 into rust-lang:master Mar 27, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 27, 2023
@compiler-errors compiler-errors deleted the new-solver-fixmes branch August 11, 2023 20:09
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. 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