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

Implement some more predicates in the new solver #107102

Merged
merged 3 commits into from
Jan 22, 2023
Merged

Implement some more predicates in the new solver #107102

merged 3 commits into from
Jan 22, 2023

Conversation

compiler-errors
Copy link
Member

Implement a few more goals. The subtype goal specifically is important, since it's required for this code to compile:

fn main() {
  let mut x = vec![];
  x.push(1i32);
}

(I think we emit a subtype goal here because of coercion).

Drive-by: Also implements --compare-mode=next-solver -- I've been using this locally a lot to find out what works and what doesn't. I'm also happy to split this out into another PR.

r? @lcnr

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Jan 20, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 20, 2023

Some changes occurred to the core trait solver

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

lcnr
lcnr reviewed Jan 20, 2023
View reviewed changes
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.

nits into r=me

compiler/rustc_trait_selection/src/solve/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/solve/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/solve/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/solve/mod.rs Outdated Show resolved Hide resolved
@lcnr lcnr 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 20, 2023
@compiler-errors
Copy link
Member Author

@bors r=lcnr rollup (only affects new solver)

@bors
Copy link
Contributor

bors commented Jan 20, 2023

📌 Commit 6aad347b3ccba9c14ec3321088b91e1c1a96cca0 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 20, 2023
@compiler-errors compiler-errors mentioned this pull request Jan 20, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 20, 2023
Closed
@bors
Copy link
Contributor

bors commented Jan 21, 2023

☔ The latest upstream changes (presumably #107143) 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 Jan 21, 2023
@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Jan 21, 2023

📌 Commit bf311502596cf3e6ba687b7a26c06d7eef51153b 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 21, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented Jan 21, 2023

📌 Commit 444cbcd has been approved by lcnr

It is now in the queue for this repository.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 21, 2023
@matthiaskrgr
Rollup merge of rust-lang#107102 - compiler-errors:new-solver-new-can…
0f0bfed 
…didats-4, r=lcnr

Implement some more predicates in the new solver

Implement a few more goals. The subtype goal specifically is important, since it's required for this code to compile:

```
fn main() {
  let mut x = vec![];
  x.push(1i32);
}
```

(I think we emit a subtype goal here because of coercion).

Drive-by: Also implements `--compare-mode=next-solver` -- I've been using this locally a lot to find out what works and what doesn't. I'm also happy to split this out into another PR.

r? `@lcnr`
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 21, 2023
Closed
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 22, 2023
@compiler-errors
Rollup merge of rust-lang#107102 - compiler-errors:new-solver-new-can…
fd0dfd3 
…didats-4, r=lcnr

Implement some more predicates in the new solver

Implement a few more goals. The subtype goal specifically is important, since it's required for this code to compile:

```
fn main() {
  let mut x = vec![];
  x.push(1i32);
}
```

(I think we emit a subtype goal here because of coercion).

Drive-by: Also implements `--compare-mode=next-solver` -- I've been using this locally a lot to find out what works and what doesn't. I'm also happy to split this out into another PR.

r? ``@lcnr``
@compiler-errors compiler-errors mentioned this pull request Jan 22, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 22, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 22, 2023
@bors
Auto merge of rust-lang#107187 - matthiaskrgr:rollup-lvwzlg2, r=matth…
cef633d 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#107102 (Implement some more predicates in the new solver)
 - rust-lang#107111 (Fix missing arguments issues and copy-paste bug for fluent)
 - rust-lang#107114 (Add note about absolute paths to Path::join)
 - rust-lang#107127 (Enable sanitizers for s390x-linux)
 - rust-lang#107152 (Migrate scraped-examples top and bottom "borders" to CSS variables)
 - rust-lang#107170 (Add myself to .mailmap)
 - rust-lang#107174 (rustdoc: Use `DefId(Map,Set)` instead of `FxHash(Map,Set)`)
 - rust-lang#107180 (Remove unnecessary `&format!`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d022013 into rust-lang:master Jan 22, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 22, 2023
@lcnr lcnr mentioned this pull request Jan 27, 2023
Open
11 tasks
@compiler-errors compiler-errors deleted the new-solver-new-candidats-4 branch August 11, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

Assignees

@lcnr lcnr

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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 @rust-log-analyzer @lcnr