Structurally normalize in selection by compiler-errors · Pull Request #113625 · rust-lang/rust

compiler-errors · 2023-07-12T17:02:31Z

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 · 2023-07-12T17:02:40Z

Some changes occurred to the core trait solver

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

lcnr · 2023-07-13T09:46:54Z

@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 · 2023-07-13T09:46:56Z

📌 Commit 518648d has been approved by lcnr

It is now in the queue for this repository.

…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`

bors · 2023-07-13T19:23:04Z

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

bors · 2023-07-14T07:21:17Z

🔒 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:

git checkout structurally-norm-in-selection (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
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.

compiler-errors · 2023-07-14T16:08:10Z

@bors r=lcnr

bors · 2023-07-14T16:08:12Z

📌 Commit d7922fb has been approved by lcnr

It is now in the queue for this repository.

…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`

bors · 2023-07-14T18:35:15Z

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

compiler-errors · 2023-07-14T18:40:39Z

@bors r=lcnr

bors · 2023-07-14T18:40:40Z

📌 Commit 7fb27e4 has been approved by lcnr

It is now in the queue for this repository.

…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 · 2023-07-15T01:09:56Z

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

bors · 2023-07-15T01:12:05Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-07-15T01:55:49Z

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 · 2023-07-15T15:40:29Z

@bors retry

…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

rustbot assigned lcnr Jul 12, 2023

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

This comment has been minimized.

Sign in to view

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

This was referenced Jul 13, 2023

Rollup of 7 pull requests #113647

Closed

Rollup of 6 pull requests #113666

Closed

compiler-errors mentioned this pull request Jul 13, 2023

Normalize the RHS of an Unsize goal in the new solver #113393

Merged

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

rust-cloud-vms bot force-pushed the structurally-norm-in-selection branch from 518648d to d7922fb Compare July 14, 2023 15:03

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

This was referenced Jul 14, 2023

Rollup of 9 pull requests #113700

Closed

Rollup of 9 pull requests #113703

Merged

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

Structurally normalize in selection

7fb27e4

rust-cloud-vms bot force-pushed the structurally-norm-in-selection branch from d7922fb to 7fb27e4 Compare July 14, 2023 18:40

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

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 mentioned this pull request Jul 15, 2023

Rollup of 6 pull requests #113732

Merged

bors merged commit da18cf8 into rust-lang:master Jul 15, 2023

rustbot added this to the 1.73.0 milestone Jul 15, 2023

compiler-errors deleted the structurally-norm-in-selection branch August 11, 2023 20:20

Uh oh!

Conversation

compiler-errors commented Jul 12, 2023

Uh oh!

rustbot commented Jul 12, 2023

Uh oh!

This comment has been minimized.

lcnr commented Jul 13, 2023

Uh oh!

bors commented Jul 13, 2023

Uh oh!

bors commented Jul 13, 2023

Uh oh!

bors commented Jul 14, 2023

Uh oh!

compiler-errors commented Jul 14, 2023

Uh oh!

bors commented Jul 14, 2023

Uh oh!

bors commented Jul 14, 2023

Uh oh!

compiler-errors commented Jul 14, 2023

Uh oh!

bors commented Jul 14, 2023

Uh oh!

bors commented Jul 15, 2023

Uh oh!

bors commented Jul 15, 2023

Uh oh!

rust-log-analyzer commented Jul 15, 2023

Uh oh!

compiler-errors commented Jul 15, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants