Skip to content

Comments

new trait solver: only consider goal changed if response is not identity#106834

Merged
bors merged 1 commit intorust-lang:masterfrom
compiler-errors:new-solver-did-changed
Jan 18, 2023
Merged

new trait solver: only consider goal changed if response is not identity#106834
bors merged 1 commit intorust-lang:masterfrom
compiler-errors:new-solver-did-changed

Conversation

@compiler-errors
Copy link
Contributor

@compiler-errors compiler-errors commented Jan 14, 2023

I think this is the right way of implementing it..

r? @lcnr

@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 Jan 14, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 14, 2023

Some changes occurred to the core trait solver

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

@BoxyUwU BoxyUwU added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Jan 14, 2023
@bors
Copy link
Collaborator

bors commented Jan 15, 2023

☔ The latest upstream changes (presumably #106742) made this pull request unmergeable. Please resolve the merge conflicts.

compiler-errors
compiler-errors commented Jan 15, 2023
View reviewed changes
@lcnr
Copy link
Contributor

lcnr commented Jan 16, 2023

looks right to me 👍

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 16, 2023

📌 Commit 1b75b6e5f0218630767cacd46afc79ba653eb1ea 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 Jan 16, 2023
@bors
Copy link
Collaborator

bors commented Jan 16, 2023

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout new-solver-did-changed (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self new-solver-did-changed --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging compiler/rustc_trait_selection/src/solve/mod.rs
CONFLICT (content): Merge conflict in compiler/rustc_trait_selection/src/solve/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 16, 2023
compiler-errors
compiler-errors commented Jan 17, 2023
View reviewed changes
compiler/rustc_trait_selection/src/solve/mod.rs
let canonical_response = self.evaluate_canonical_goal(canonical_goal)?;
Ok((
true, // FIXME: check whether `var_values` are an identity substitution.
!canonical_response.value.var_values.is_identity(),
Copy link
Contributor Author

@compiler-errors compiler-errors Jan 17, 2023

Choose a reason for hiding this comment

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

this needed a !

@compiler-errors
Copy link
Contributor Author

compiler-errors commented Jan 17, 2023

@bors r=lcnr

@bors
Copy link
Collaborator

bors commented Jan 17, 2023

📌 Commit 148e4f7 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 17, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 17, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 17, 2023
@bors
Auto merge of rust-lang#106998 - matthiaskrgr:rollup-hmfisji, r=matth…
edefa41 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#104505 (Remove double spaces after dots in comments)
 - rust-lang#106784 (prevent E0512 from emitting [type error] by checking the references_error)
 - rust-lang#106834 (new trait solver: only consider goal changed if response is not identity)
 - rust-lang#106889 (Mention the lack of `windows_mut` in `windows`)
 - rust-lang#106963 (Use `scope_expr_id` from `ProbeCtxt`)
 - rust-lang#106970 (Switch to `EarlyBinder` for `item_bounds` query)
 - rust-lang#106980 (Hide `_use_mk_alias_ty_instead` in `<AliasTy as Debug>::fmt`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fc9e2c1 into rust-lang:master Jan 18, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 18, 2023
@compiler-errors compiler-errors deleted the new-solver-did-changed branch August 11, 2023 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@lcnr lcnr

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

Development

Successfully merging this pull request may close these issues.

5 participants

@compiler-errors @rustbot @bors @lcnr @BoxyUwU