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_infer/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_infer/src')
| -rw-r--r-- | compiler/rustc_infer/src/infer/outlives/mod.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_infer/src/traits/util.rs | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_infer/src/infer/outlives/mod.rs b/compiler/rustc_infer/src/infer/outlives/mod.rs index c998c923760..cb92fc6ddb6 100644 --- a/compiler/rustc_infer/src/infer/outlives/mod.rs +++ b/compiler/rustc_infer/src/infer/outlives/mod.rs @@ -31,8 +31,7 @@ pub fn explicit_outlives_bounds<'tcx>( | ty::ClauseKind::Projection(_) | ty::ClauseKind::ConstArgHasType(_, _) | ty::ClauseKind::WellFormed(_) - | ty::ClauseKind::ConstEvaluatable(_) - | ty::ClauseKind::TypeWellFormedFromEnv(_) => None, + | ty::ClauseKind::ConstEvaluatable(_) => None, }) } diff --git a/compiler/rustc_infer/src/traits/util.rs b/compiler/rustc_infer/src/traits/util.rs index 66389cf5995..3aeed93baf2 100644 --- a/compiler/rustc_infer/src/traits/util.rs +++ b/compiler/rustc_infer/src/traits/util.rs @@ -370,9 +370,6 @@ impl<'tcx, O: Elaboratable<'tcx>> Elaborator<'tcx, O> { }), ); } - ty::PredicateKind::Clause(ty::ClauseKind::TypeWellFormedFromEnv(..)) => { - // Nothing to elaborate - } ty::PredicateKind::Ambiguous => {} ty::PredicateKind::AliasRelate(..) => { // No |