Skip to content

Commit cd68ead

Browse files
borsbors
committed
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`
2 parents 52d8c49 + 0c73b41 commit cd68ead

File tree

89 files changed

+35
-3864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+35
-3864
lines changed

‎Cargo.lock

-75
Original file line numberDiff line numberDiff line change
@@ -433,60 +433,6 @@ dependencies = [
433433
"rustc-std-workspace-core",
434434
]
435435

436-
[[package]]
437-
name = "chalk-derive"
438-
version = "0.92.0"
439-
source = "registry+https://github.com/rust-lang/crates.io-index"
440-
checksum = "ff5053a8a42dbff5279a82423946fc56dc1253b76cf211b2b3c14b3aad4e1281"
441-
dependencies = [
442-
"proc-macro2",
443-
"quote",
444-
"syn 2.0.8",
445-
"synstructure 0.13.0",
446-
]
447-
448-
[[package]]
449-
name = "chalk-engine"
450-
version = "0.92.0"
451-
source = "registry+https://github.com/rust-lang/crates.io-index"
452-
checksum = "b9d0e18f29b8b0f4dcf7d31fe00c884af67719699e381e8dcc9d9624b1621c60"
453-
dependencies = [
454-
"chalk-derive",
455-
"chalk-ir",
456-
"chalk-solve",
457-
"rustc-hash",
458-
"tracing",
459-
]
460-
461-
[[package]]
462-
name = "chalk-ir"
463-
version = "0.92.0"
464-
source = "registry+https://github.com/rust-lang/crates.io-index"
465-
checksum = "8a56de2146a8ed0fcd54f4bd50db852f1de4eac9e1efe568494f106c21b77d2a"
466-
dependencies = [
467-
"bitflags 1.3.2",
468-
"chalk-derive",
469-
"lazy_static",
470-
]
471-
472-
[[package]]
473-
name = "chalk-solve"
474-
version = "0.92.0"
475-
source = "registry+https://github.com/rust-lang/crates.io-index"
476-
checksum = "b392e02b4c81ec76d3748da839fc70a5539b83d27c9030668463d34d5110b860"
477-
dependencies = [
478-
"chalk-derive",
479-
"chalk-ir",
480-
"ena",
481-
"indexmap 1.9.3",
482-
"itertools",
483-
"petgraph",
484-
"rustc-hash",
485-
"tracing",
486-
"tracing-subscriber",
487-
"tracing-tree",
488-
]
489-
490436
[[package]]
491437
name = "chrono"
492438
version = "0.4.26"
@@ -1168,12 +1114,6 @@ dependencies = [
11681114
"windows-sys 0.48.0",
11691115
]
11701116

1171-
[[package]]
1172-
name = "fixedbitset"
1173-
version = "0.2.0"
1174-
source = "registry+https://github.com/rust-lang/crates.io-index"
1175-
checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
1176-
11771117
[[package]]
11781118
name = "flate2"
11791119
version = "1.0.26"
@@ -2466,16 +2406,6 @@ dependencies = [
24662406
"sha2",
24672407
]
24682408

2469-
[[package]]
2470-
name = "petgraph"
2471-
version = "0.5.1"
2472-
source = "registry+https://github.com/rust-lang/crates.io-index"
2473-
checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
2474-
dependencies = [
2475-
"fixedbitset",
2476-
"indexmap 1.9.3",
2477-
]
2478-
24792409
[[package]]
24802410
name = "phf"
24812411
version = "0.10.1"
@@ -3675,7 +3605,6 @@ name = "rustc_middle"
36753605
version = "0.0.0"
36763606
dependencies = [
36773607
"bitflags 1.3.2",
3678-
"chalk-ir",
36793608
"derive_more",
36803609
"either",
36813610
"field-offset",
@@ -4102,9 +4031,6 @@ dependencies = [
41024031
name = "rustc_traits"
41034032
version = "0.0.0"
41044033
dependencies = [
4105-
"chalk-engine",
4106-
"chalk-ir",
4107-
"chalk-solve",
41084034
"rustc_ast",
41094035
"rustc_data_structures",
41104036
"rustc_hir",
@@ -5033,7 +4959,6 @@ dependencies = [
50334959
"thread_local",
50344960
"tracing",
50354961
"tracing-core",
5036-
"tracing-log",
50374962
]
50384963

50394964
[[package]]

‎compiler/rustc_hir_analysis/src/astconv/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -983,8 +983,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
983983
ty::ClauseKind::RegionOutlives(_)
984984
| ty::ClauseKind::ConstArgHasType(..)
985985
| ty::ClauseKind::WellFormed(_)
986-
| ty::ClauseKind::ConstEvaluatable(_)
987-
| ty::ClauseKind::TypeWellFormedFromEnv(_) => {
986+
| ty::ClauseKind::ConstEvaluatable(_) => {
988987
bug!()
989988
}
990989
}

‎compiler/rustc_hir_analysis/src/impl_wf_check/min_specialization.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,6 @@ fn trait_predicate_kind<'tcx>(
551551
| ty::PredicateKind::ClosureKind(..)
552552
| ty::PredicateKind::Clause(ty::ClauseKind::ConstEvaluatable(..))
553553
| ty::PredicateKind::ConstEquate(..)
554-
| ty::PredicateKind::Ambiguous
555-
| ty::PredicateKind::Clause(ty::ClauseKind::TypeWellFormedFromEnv(..)) => None,
554+
| ty::PredicateKind::Ambiguous => None,
556555
}
557556
}

‎compiler/rustc_hir_analysis/src/outlives/explicit.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ impl<'tcx> ExplicitPredicatesMap<'tcx> {
5353
| ty::ClauseKind::Projection(_)
5454
| ty::ClauseKind::ConstArgHasType(_, _)
5555
| ty::ClauseKind::WellFormed(_)
56-
| ty::ClauseKind::ConstEvaluatable(_)
57-
| ty::ClauseKind::TypeWellFormedFromEnv(_) => {}
56+
| ty::ClauseKind::ConstEvaluatable(_) => {}
5857
}
5958
}
6059

‎compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
685685
// inference variable.
686686
| ty::PredicateKind::ClosureKind(..)
687687
| ty::PredicateKind::Ambiguous
688-
| ty::PredicateKind::Clause(ty::ClauseKind::TypeWellFormedFromEnv(..)) => None,
688+
=> None,
689689
},
690690
)
691691
}

‎compiler/rustc_hir_typeck/src/method/probe.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
847847
| ty::ClauseKind::Projection(_)
848848
| ty::ClauseKind::ConstArgHasType(_, _)
849849
| ty::ClauseKind::WellFormed(_)
850-
| ty::ClauseKind::ConstEvaluatable(_)
851-
| ty::ClauseKind::TypeWellFormedFromEnv(_) => None,
850+
| ty::ClauseKind::ConstEvaluatable(_) => None,
852851
}
853852
});
854853

‎compiler/rustc_infer/src/infer/outlives/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ pub fn explicit_outlives_bounds<'tcx>(
3131
| ty::ClauseKind::Projection(_)
3232
| ty::ClauseKind::ConstArgHasType(_, _)
3333
| ty::ClauseKind::WellFormed(_)
34-
| ty::ClauseKind::ConstEvaluatable(_)
35-
| ty::ClauseKind::TypeWellFormedFromEnv(_) => None,
34+
| ty::ClauseKind::ConstEvaluatable(_) => None,
3635
})
3736
}
3837

‎compiler/rustc_infer/src/traits/util.rs

-3
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,6 @@ impl<'tcx, O: Elaboratable<'tcx>> Elaborator<'tcx, O> {
370370
}),
371371
);
372372
}
373-
ty::PredicateKind::Clause(ty::ClauseKind::TypeWellFormedFromEnv(..)) => {
374-
// Nothing to elaborate
375-
}
376373
ty::PredicateKind::Ambiguous => {}
377374
ty::PredicateKind::AliasRelate(..) => {
378375
// No

‎compiler/rustc_interface/src/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ fn test_unstable_options_tracking_hash() {
841841
tracked!(thir_unsafeck, true);
842842
tracked!(tiny_const_eval_limit, true);
843843
tracked!(tls_model, Some(TlsModel::GeneralDynamic));
844-
tracked!(trait_solver, TraitSolver::Chalk);
844+
tracked!(trait_solver, TraitSolver::NextCoherence);
845845
tracked!(translate_remapped_path_to_local_path, false);
846846
tracked!(trap_unreachable, Some(false));
847847
tracked!(treat_err_as_bug, NonZeroUsize::new(1));

‎compiler/rustc_lint/src/builtin.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1606,8 +1606,7 @@ impl<'tcx> LateLintPass<'tcx> for TrivialConstraints {
16061606
// Ignore bounds that a user can't type
16071607
| ClauseKind::WellFormed(..)
16081608
// FIXME(generic_const_exprs): `ConstEvaluatable` can be written
1609-
| ClauseKind::ConstEvaluatable(..)
1610-
| ClauseKind::TypeWellFormedFromEnv(_) => continue,
1609+
| ClauseKind::ConstEvaluatable(..) => continue,
16111610
};
16121611
if predicate.is_global() {
16131612
cx.emit_spanned_lint(

‎compiler/rustc_middle/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ edition = "2021"
77

88
[dependencies]
99
bitflags = "1.2.1"
10-
chalk-ir = "0.92.0"
1110
derive_more = "0.99.17"
1211
either = "1.5.0"
1312
gsgdt = "0.1.2"

‎compiler/rustc_middle/src/query/erase.rs

-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ tcx_lifetime! {
315315
rustc_middle::mir::interpret::ConstValue,
316316
rustc_middle::mir::interpret::GlobalId,
317317
rustc_middle::mir::interpret::LitToConstInput,
318-
rustc_middle::traits::ChalkEnvironmentAndGoal,
319318
rustc_middle::traits::query::MethodAutoderefStepsResult,
320319
rustc_middle::traits::query::type_op::AscribeUserType,
321320
rustc_middle::traits::query::type_op::Eq,

‎compiler/rustc_middle/src/query/mod.rs

+2-11
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ use crate::traits::query::{
3939
};
4040
use crate::traits::specialization_graph;
4141
use crate::traits::{
42-
CanonicalChalkEnvironmentAndGoal, CodegenObligationError, EvaluationResult, ImplSource,
43-
ObjectSafetyViolation, ObligationCause, OverflowError, WellFormedLoc,
42+
CodegenObligationError, EvaluationResult, ImplSource, ObjectSafetyViolation, ObligationCause,
43+
OverflowError, WellFormedLoc,
4444
};
4545
use crate::ty::fast_reject::SimplifiedType;
4646
use crate::ty::layout::ValidityRequirement;
@@ -1971,15 +1971,6 @@ rustc_queries! {
19711971
desc { "evaluating trait selection obligation `{}`", goal.value.value }
19721972
}
19731973

1974-
query evaluate_goal(
1975-
goal: CanonicalChalkEnvironmentAndGoal<'tcx>
1976-
) -> Result<
1977-
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
1978-
NoSolution
1979-
> {
1980-
desc { "evaluating trait selection obligation `{}`", goal.value }
1981-
}
1982-
19831974
/// Do not call this query directly: part of the `Eq` type-op
19841975
query type_op_ascribe_user_type(
19851976
goal: CanonicalTypeOpAscribeUserTypeGoal<'tcx>

0 commit comments

Comments
 (0)