bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make assoc types work with ?const opt=out

Browse source
This commit is contained in:
Deadbeef 2021-07-26 17:25:01 +08:00
parent 8c2a1e8e43
commit 1fa712d0ba
No known key found for this signature in database
GPG key ID: 027DF9338862ADDD
7 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/rustc_typeck/src/check/compare_method.rs
View file

@ -1292,28 +1292,12 @@ pub fn check_type_bounds<'tcx>(
};
tcx.infer_ctxt().enter(move |infcx| {
// if the item is inside a const impl, we transform the predicates to be const.
let constness = impl_ty
.container
.impl_def_id()
.map(|did| tcx.impl_constness(did))
.unwrap_or(hir::Constness::NotConst);
let pred_map = match constness {
hir::Constness::NotConst => |p, _| p,
hir::Constness::Const => |p: ty::Predicate<'tcx>, tcx: TyCtxt<'tcx>| {
p.kind()
.map_bound(|kind| match kind {
ty::PredicateKind::Trait(mut tp) => {
tp.constness = hir::Constness::Const;
ty::PredicateKind::Trait(tp)
}
kind => kind,
})
.to_predicate(tcx)
},
};
let inh = Inherited::with_constness(infcx, impl_ty.def_id.expect_local(), constness);
let infcx = &inh.infcx;
let mut selcx = traits::SelectionContext::new(&infcx);
@ -1332,7 +1316,7 @@ pub fn check_type_bounds<'tcx>(
.explicit_item_bounds(trait_ty.def_id)
.iter()
.map(|&(bound, span)| {
let concrete_ty_bound = pred_map(bound.subst(tcx, rebased_substs), tcx);
let concrete_ty_bound = bound.subst(tcx, rebased_substs);
debug!("check_type_bounds: concrete_ty_bound = {:?}", concrete_ty_bound);
traits::Obligation::new(mk_cause(span), param_env, concrete_ty_bound)
@ -1350,10 +1334,7 @@ pub fn check_type_bounds<'tcx>(
debug!("compare_projection_bounds: normalized predicate = {:?}", normalized_predicate);
obligation.predicate = normalized_predicate;
inh.register_predicates(obligations.into_iter().map(|mut o| {
o.predicate = pred_map(o.predicate, tcx);
o
}));
inh.register_predicates(obligations);
inh.register_predicate(obligation);
}

2
compiler/rustc_typeck/src/check/fn_ctxt/mod.rs
View file

@ -174,7 +174,7 @@ impl<'a, 'tcx> AstConv<'tcx> for FnCtxt<'a, 'tcx> {
}
fn default_constness_for_trait_bounds(&self) -> hir::Constness {
self.tcx.hir().get(self.body_id).constness()
self.tcx.hir().get(self.body_id).constness_for_typeck()
}
fn get_type_parameter_bounds(

2
compiler/rustc_typeck/src/check/inherited.rs
View file

@ -98,7 +98,7 @@ impl Inherited<'a, 'tcx> {
pub(super) fn new(infcx: InferCtxt<'a, 'tcx>, def_id: LocalDefId) -> Self {
let tcx = infcx.tcx;
let item_id = tcx.hir().local_def_id_to_hir_id(def_id);
Self::with_constness(infcx, def_id, tcx.hir().get(item_id).constness())
Self::with_constness(infcx, def_id, tcx.hir().get(item_id).constness_for_typeck())
}
pub(super) fn with_constness(

2
compiler/rustc_typeck/src/collect.rs
View file

@ -364,7 +364,7 @@ impl AstConv<'tcx> for ItemCtxt<'tcx> {
}
fn default_constness_for_trait_bounds(&self) -> hir::Constness {
self.node().constness()
self.node().constness_for_typeck()
}
fn get_type_parameter_bounds(