about summary refs log tree commit diff
path: root/src/librustdoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-07-04 09:09:09 +0000
committerbors <bors@rust-lang.org>2023-07-04 09:09:09 +0000
commitcd68ead9ecfdb3bfbd65cb5ff444c5eaadd21a4d (patch)
treeefdb44d3a999e781277c60a2cc1726dc4c42faee /src/librustdoc
parent52d8c490a3aabe65cdd9f2d3aed95034dd5dbad7 (diff)
parent0c73b41cd69c33b76ba2a833bf8bd94a95e73ccb (diff)
downloadrust-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 'src/librustdoc')
-rw-r--r--src/librustdoc/clean/mod.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index b2f9c0bccea..0182d50773d 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -342,8 +342,7 @@ pub(crate) fn clean_predicate<'tcx>(
         // FIXME(generic_const_exprs): should this do something?
         ty::ClauseKind::ConstEvaluatable(..)
         | ty::ClauseKind::WellFormed(..)
-        | ty::ClauseKind::ConstArgHasType(..)
-        | ty::ClauseKind::TypeWellFormedFromEnv(..) => None,
+        | ty::ClauseKind::ConstArgHasType(..) => None,
     }
 }