diff options
| author | bors <bors@rust-lang.org> | 2023-07-04 09:09:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-04 09:09:09 +0000 |
| commit | cd68ead9ecfdb3bfbd65cb5ff444c5eaadd21a4d (patch) | |
| tree | efdb44d3a999e781277c60a2cc1726dc4c42faee /compiler/rustc_interface/src | |
| parent | 52d8c490a3aabe65cdd9f2d3aed95034dd5dbad7 (diff) | |
| parent | 0c73b41cd69c33b76ba2a833bf8bd94a95e73ccb (diff) | |
| download | rust-cd68ead9ecfdb3bfbd65cb5ff444c5eaadd21a4d.tar.gz rust-cd68ead9ecfdb3bfbd65cb5ff444c5eaadd21a4d.zip | |
Auto merge of #113303 - compiler-errors:yeet-chalk, r=lcnr
Remove chalk support from the compiler 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`
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/tests.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs index 0f5dba1df14..09141afd137 100644 --- a/compiler/rustc_interface/src/tests.rs +++ b/compiler/rustc_interface/src/tests.rs @@ -841,7 +841,7 @@ fn test_unstable_options_tracking_hash() { tracked!(thir_unsafeck, true); tracked!(tiny_const_eval_limit, true); tracked!(tls_model, Some(TlsModel::GeneralDynamic)); - tracked!(trait_solver, TraitSolver::Chalk); + tracked!(trait_solver, TraitSolver::NextCoherence); tracked!(translate_remapped_path_to_local_path, false); tracked!(trap_unreachable, Some(false)); tracked!(treat_err_as_bug, NonZeroUsize::new(1)); |