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

Split -Zchalk flag into -Ztrait-solver=(classic|chalk|next) flag #106385

Merged
merged 3 commits into from
Jan 5, 2023
Merged

Split -Zchalk flag into -Ztrait-solver=(classic|chalk|next) flag #106385

merged 3 commits into from
Jan 5, 2023

Conversation

compiler-errors
Copy link
Member

We'll eventually need a way to select more than chalk + not-chalk.

Does this need an MCP since it's touching a -Z flag? Or perhaps I should preserve -Zchalk for the time being... maybe I could make it a warning to use that flag? cc @rust-lang/types

r? types

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

rustbot commented Jan 2, 2023

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr

@compiler-errors
Copy link
Member Author

Also could probably use advice on what to call the current solver. "stock" is perhaps not the best name, but couldn't think of anything better.

@rustbot rustbot added the A-testsuite Area: The testsuite used to check the correctness of rustc label Jan 2, 2023
@compiler-errors compiler-errors force-pushed the new-solver-flag branch 3 times, most recently from cb28d5b to e8a256e Compare January 3, 2023 00:55
@jeffparsons
Copy link
Contributor

Also could probably use advice on what to call the current solver.

How about "classic", with an alias "default" that currently points to "classic" but that could be updated in future.

@bors
Copy link
Collaborator

bors commented Jan 4, 2023

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

@jackh726
Copy link
Member

jackh726 commented Jan 4, 2023

"stock" -> "legacy"?

r=me either way

I don't think we need an MCP. I'm not sure if -Z options require them anyways. But regardless, this is definitely a types thing and pretty clearly falls under our plans, so this shouldn't come as a surprise to anyone.

@compiler-errors
Copy link
Member Author

I actually prefer "classic" to "legacy".

I will probably also put up another PR which reintroduces -Zchalk as an opt that fails with an explicit message mentioning -Ztrait-solver=chalk, just in case people are confused -- I certainly would be. But that's a bit more invasive change, so I'd prefer if it's reviewed separately/we can discuss whether it's necessary.

@bors r=jackh726

@bors
Copy link
Collaborator

bors commented Jan 4, 2023

📌 Commit cfacdceb9be226bf6160b4169e02b0104feb0645 has been approved by jackh726

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 4, 2023
@klensy
Copy link
Contributor

klensy commented Jan 4, 2023

PR title should be fixed too?

@compiler-errors compiler-errors changed the title Split -Zchalk flag into -Ztrait-solver=(stock|chalk|next) flag Split -Zchalk flag into -Ztrait-solver=(classic|chalk|next) flag Jan 4, 2023
@compiler-errors
Copy link
Member Author

@bors r=jackh726

@bors
Copy link
Collaborator

bors commented Jan 4, 2023

📌 Commit 8b0f43b has been approved by jackh726

It is now in the queue for this repository.

compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 5, 2023
@compiler-errors
Rollup merge of rust-lang#106385 - compiler-errors:new-solver-flag, r…
214b33b 
…=jackh726

Split `-Zchalk` flag into `-Ztrait-solver=(classic|chalk|next)` flag

We'll eventually need a way to select more than chalk + not-chalk.

Does this need an MCP since it's touching a `-Z` flag? Or perhaps I should preserve `-Zchalk` for the time being... maybe I could make it a warning to use that flag? cc `@rust-lang/types`

r? types
This was referenced Jan 5, 2023
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 5, 2023
@bors
Auto merge of rust-lang#106482 - compiler-errors:rollup-g7n1p39, r=co…
1429899 
…mpiler-errors

Rollup of 6 pull requests

Successful merges:

 - rust-lang#105846 (Account for return-position `impl Trait` in trait in `opt_suggest_box_span`)
 - rust-lang#106385 (Split `-Zchalk` flag into `-Ztrait-solver=(classic|chalk|next)` flag)
 - rust-lang#106403 (Rename `hir::Map::{get_,find_}parent_node` to `hir::Map::{,opt_}parent_id`, and add `hir::Map::{get,find}_parent`)
 - rust-lang#106462 (rustdoc: remove unnecessary wrapper around sidebar and mobile logos)
 - rust-lang#106464 (Update Fuchsia walkthrough with new configs)
 - rust-lang#106478 (Tweak wording of fn call with wrong number of args)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 13bb8a8 into rust-lang:master Jan 5, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 5, 2023
@bors
Copy link
Collaborator

bors commented Jan 5, 2023

⌛ Testing commit 8b0f43b with merge 1429899...

lcnr
lcnr reviewed Jan 5, 2023
View reviewed changes
compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
@@ -1167,7 +1168,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
}

ty::PredicateKind::WellFormed(ty) => {
if !self.tcx.sess.opts.unstable_opts.chalk {
if self.tcx.sess.opts.unstable_opts.trait_solver != TraitSolver::Chalk {
Copy link
Contributor

Choose a reason for hiding this comment

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

the new solver can also error for WellFormed by themselves

This was referenced Jan 5, 2023
Closed
Merged
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 7, 2023
@compiler-errors
Rollup merge of rust-lang#106525 - compiler-errors:new-solver-wf, r=j…
258257a 
…ackh726

Report WF error for chalk *and* new solver

addressing this nit rust-lang#106385 (comment)

No test yet because new solver is currently unusable, lol

r? `@lcnr`
@BoxyUwU BoxyUwU added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Jan 11, 2023
@lcnr lcnr mentioned this pull request Jan 27, 2023
Open
12 tasks
@compiler-errors compiler-errors deleted the new-solver-flag 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

@klensy klensy klensy left review comments

@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.
8 participants
@compiler-errors @rustbot @jeffparsons @bors @jackh726 @klensy @lcnr @BoxyUwU