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

Structurally normalize in selection #113625

Merged
merged 1 commit into from
Jul 15, 2023
Merged

Structurally normalize in selection #113625

merged 1 commit into from
Jul 15, 2023

Conversation

compiler-errors
Copy link
Member

We need to do this because of the fact that we're checking the Ty::kind on a type during selection, but goals passed into select are not necessarily normalized.

Right now, we're (kinda) unnecessarily normalizing the RHS of a trait upcasting goal, which is broken for different reasons (#113393). But I'm waiting for this PR to land before discussing that one.

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

rustbot commented Jul 12, 2023

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
Copy link
Contributor

lcnr commented Jul 13, 2023

@bors r+ rollup

we should look into a way to make it easier to structurally normalize by default, though I am not sure how to best do that

@bors
Copy link
Contributor

bors commented Jul 13, 2023

📌 Commit 518648d 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 Jul 13, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
@matthiaskrgr
Rollup merge of rust-lang#113625 - compiler-errors:structurally-norm-…
2a8ec6e 
…in-selection, r=lcnr

Structurally normalize in selection

We need to do this because of the fact that we're checking the `Ty::kind` on a type during selection, but goals passed into select are not necessarily normalized.

Right now, we're (kinda) unnecessarily normalizing the RHS of a trait upcasting goal, which is broken for different reasons (rust-lang#113393). But I'm waiting for this PR to land before discussing that one.

r? `@lcnr`
This was referenced Jul 13, 2023
Closed
Closed
@compiler-errors compiler-errors mentioned this pull request Jul 13, 2023
Merged
@bors
Copy link
Contributor

bors commented Jul 13, 2023

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

@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 Jul 13, 2023
@bors
Copy link
Contributor

bors commented Jul 14, 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 structurally-norm-in-selection (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 structurally-norm-in-selection --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/eval_ctxt/select.rs
CONFLICT (content): Merge conflict in compiler/rustc_trait_selection/src/solve/eval_ctxt/select.rs
Automatic merge failed; fix conflicts and then commit the result.

@rust-cloud-vms rust-cloud-vms bot force-pushed the structurally-norm-in-selection branch from 518648d to d7922fb Compare July 14, 2023 15:03
@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Jul 14, 2023

📌 Commit d7922fb 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 Jul 14, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 14, 2023
@matthiaskrgr
Rollup merge of rust-lang#113625 - compiler-errors:structurally-norm-…
b0ee988 
…in-selection, r=lcnr

Structurally normalize in selection

We need to do this because of the fact that we're checking the `Ty::kind` on a type during selection, but goals passed into select are not necessarily normalized.

Right now, we're (kinda) unnecessarily normalizing the RHS of a trait upcasting goal, which is broken for different reasons (rust-lang#113393). But I'm waiting for this PR to land before discussing that one.

r? `@lcnr`
This was referenced Jul 14, 2023
Closed
Merged
@bors
Copy link
Contributor

bors commented Jul 14, 2023

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

@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 Jul 14, 2023
@rust-cloud-vms rust-cloud-vms bot force-pushed the structurally-norm-in-selection branch from d7922fb to 7fb27e4 Compare July 14, 2023 18:40
@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Jul 14, 2023

📌 Commit 7fb27e4 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 Jul 14, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 14, 2023
@bors
Auto merge of rust-lang#113703 - matthiaskrgr:rollup-19uhwuh, r=matth…
3b55d23 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#113599 (Use maybe_body_owned_by for multiple suggestions)
 - rust-lang#113662 (Rename VecDeque's `rotate_left` and `rotate_right` parameters)
 - rust-lang#113681 (rustdoc-json: Add test for private supertrait.)
 - rust-lang#113682 (trait system refactor ping: also apply to nested modules of `solve`)
 - rust-lang#113685 (Print artifact sizes in `opt-dist`)
 - rust-lang#113688 (llvm-wrapper: update for LLVM API change)
 - rust-lang#113692 (tests: adapt for removal of -opaque-pointers in LLVM 17)
 - rust-lang#113698 (Make it clearer that we're just checking for an RPITIT)
 - rust-lang#113699 (update Miri)

Failed merges:

 - rust-lang#113625 (Structurally normalize in selection)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jul 15, 2023

⌛ Testing commit 7fb27e4 with merge 2ffc567f9a67c863879bb608b5432dd4b0a9d934...

@bors
Copy link
Contributor

bors commented Jul 15, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 15, 2023
@rust-log-analyzer
Copy link
Collaborator

The job armhf-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
curl: (22) The requested URL returned error: 404 

error: failed to download llvm from ci

    help: old builds get deleted after a certain time
    help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:
    [llvm]
    download-ci-llvm = false
    
Build completed unsuccessfully in 0:00:00

@compiler-errors
Copy link
Member Author

@bors retry

@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 Jul 15, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 15, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 15, 2023
@bors
Auto merge of rust-lang#113732 - matthiaskrgr:rollup-nm5qy4i, r=matth…
425726d 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#113625 (Structurally normalize in selection)
 - rust-lang#113644 (misc bootstrap cleanups)
 - rust-lang#113663 (Implement "items do not inherit unsafety" note for THIR unsafeck)
 - rust-lang#113683 (remove outdated `FIXME`s in bootstrap internals)
 - rust-lang#113709 (rustdoc: use src consistently over source in CSS/JS)
 - rust-lang#113724 (Migrate GUI colors test to original CSS color format)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit da18cf8 into rust-lang:master Jul 15, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 15, 2023
@compiler-errors compiler-errors deleted the structurally-norm-in-selection branch August 11, 2023 20:20
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.73.0
Development

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