bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Split -Zchalk flag into -Ztrait-solver=(stock|chalk|next) flag

Browse source
This commit is contained in:
Michael Goulet 2023-01-02 23:12:47 +00:00
parent df756439df
commit a4974fa9c7
7 changed files with 44 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_ty_utils/src/ty.rs
View file

@ -2,6 +2,7 @@ use rustc_data_structures::fx::FxIndexSet;
use rustc_hir as hir;
use rustc_hir::def_id::DefId;
use rustc_middle::ty::{self, Binder, Predicate, PredicateKind, ToPredicate, Ty, TyCtxt};
use rustc_session::config::TraitSolver;
use rustc_trait_selection::traits;
fn sized_constraint_for_ty<'tcx>(
@ -121,7 +122,7 @@ fn param_env(tcx: TyCtxt<'_>, def_id: DefId) -> ty::ParamEnv<'_> {
// are any errors at that point, so outside of type inference you can be
// sure that this will succeed without errors anyway.
if tcx.sess.opts.unstable_opts.chalk {
if tcx.sess.opts.unstable_opts.trait_solver == TraitSolver::Chalk {
let environment = well_formed_types_in_env(tcx, def_id);
predicates.extend(environment);
}