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

Remove chalk support from the compiler #113303

Merged
merged 3 commits into from
Jul 4, 2023
Merged

Remove chalk support from the compiler #113303

merged 3 commits into from
Jul 4, 2023

Conversation

compiler-errors
Copy link
Member

Removes chalk (-Ztrait-solver=chalk) from the compiler and prunes any dead code resulting from this, mainly:

  • Remove the chalk compatibility layer in compiler/rustc_traits/src/chalk
  • Remove the chalk flag -Ztrait-solver=chalk and its TraitEngine implementation
  • Remove TypeWellFormedFromEnv (and its many bug!() match arms)
  • Remove the chalk migration mode from compiletest
  • Remove the chalkify UI tests (do we want to keep any of these, but migrate them to -Ztrait-solver=next??)

Fulfills rust-lang/types-team#93.

r? @jackh726

@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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 3, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 3, 2023

Some changes occurred to the core trait solver

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

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

cc @lcnr, @compiler-errors

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@compiler-errors compiler-errors added T-types Relevant to the types team, which will review and decide on the PR/issue. and removed T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 3, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jul 3, 2023
lcnr
lcnr reviewed Jul 4, 2023
View reviewed changes
compiler/rustc_trait_selection/src/traits/engine.rs
@@ -39,7 +39,6 @@ impl<'tcx> TraitEngineExt<'tcx> for dyn TraitEngine<'tcx> {
(TraitSolver::Next | TraitSolver::NextCoherence, true) => {
Box::new(NextFulfillmentCtxt::new(infcx))
}
(TraitSolver::Chalk, false) => Box::new(ChalkFulfillmentContext::new(infcx)),
_ => bug!(
Copy link
Contributor

Choose a reason for hiding this comment

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

followup: this match could be exhaustive?

@lcnr
Copy link
Contributor

lcnr commented Jul 4, 2023

@bors r+ rollup=never p=10 (merge conflicts)

@bors
Copy link
Contributor

bors commented Jul 4, 2023

📌 Commit 0c73b41 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 4, 2023
@lcnr lcnr self-assigned this Jul 4, 2023
@bors
Copy link
Contributor

bors commented Jul 4, 2023

⌛ Testing commit 0c73b41 with merge cd68ead...

@bors
Copy link
Contributor

bors commented Jul 4, 2023

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing cd68ead to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 4, 2023
@bors bors merged commit cd68ead into rust-lang:master Jul 4, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jul 4, 2023
@bors bors mentioned this pull request Jul 4, 2023
Closed
This was referenced Jul 4, 2023
Merged
Merged
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cd68ead): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.4% [1.1%, 3.8%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.7% [-2.7%, -2.7%] 1
Improvements ✅
(secondary)		 -2.3% [-2.3%, -2.3%] 1
All ❌✅ (primary) -2.7% [-2.7%, -2.7%] 1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 672.679s -> 654.344s (-2.73%)

@compiler-errors compiler-errors deleted the yeet-chalk branch August 11, 2023 20:22
@fmease fmease mentioned this pull request Nov 3, 2023
Open
@fmease fmease mentioned this pull request Jun 19, 2024
Merged
fee1-dead added a commit to fee1-dead-contrib/rust that referenced this pull request Jun 19, 2024
@fee1-dead
Rollup merge of rust-lang#126668 - fmease:rm-rustc_dump_program_claus…
be3b566 
…es-attrs, r=fee1-dead

Remove now NOP attrs `#[rustc_dump{,_env}_program_clauses]`

Likely NOP since rust-lang#113303.

r? `@fee1-dead`
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
@rust-timer
Unrolled build for rust-lang#126668
ce5b1c9 
Rollup merge of rust-lang#126668 - fmease:rm-rustc_dump_program_clauses-attrs, r=fee1-dead

Remove now NOP attrs `#[rustc_dump{,_env}_program_clauses]`

Likely NOP since rust-lang#113303.

r? `@fee1-dead`
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

@jackh726 jackh726

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-types Relevant to the types 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.72.0
Development

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