nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-23 20:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix subst error for consts in wfcheck

Browse Source
This commit is contained in:
varkor 2019-05-03 14:42:32 +01:00
parent c187f71120
commit 823293bf16
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librustc_typeck/check/wfcheck.rs
View File

@ -421,8 +421,8 @@ fn check_where_clauses<'a, 'gcx, 'fcx, 'tcx>(
return_ty: Option<Ty<'tcx>>, return_ty: Option<Ty<'tcx>>,
) { ) {
let predicates = fcx.tcx.predicates_of(def_id); let predicates = fcx.tcx.predicates_of(def_id);
let generics = tcx.generics_of(def_id); let generics = tcx.generics_of(def_id);
let is_our_default = |def: &ty::GenericParamDef| { let is_our_default = |def: &ty::GenericParamDef| {
match def.kind { match def.kind {
GenericParamDefKind::Type { has_default, .. } => { GenericParamDefKind::Type { has_default, .. } => {
@ -465,6 +465,7 @@ fn check_where_clauses<'a, 'gcx, 'fcx, 'tcx>(
// All regions are identity. // All regions are identity.
fcx.tcx.mk_param_from_def(param) fcx.tcx.mk_param_from_def(param)
} }
GenericParamDefKind::Type { .. } => { GenericParamDefKind::Type { .. } => {
// If the param has a default, // If the param has a default,
if is_our_default(param) { if is_our_default(param) {
@ -478,25 +479,24 @@ fn check_where_clauses<'a, 'gcx, 'fcx, 'tcx>(
// Mark unwanted params as err. // Mark unwanted params as err.
fcx.tcx.types.err.into() fcx.tcx.types.err.into()
} }
GenericParamDefKind::Const => { GenericParamDefKind::Const => {
// FIXME(const_generics:defaults) // FIXME(const_generics:defaults)
fcx.tcx.types.err.into() fcx.tcx.consts.err.into()
} }
} }
}); });
// Now we build the substituted predicates. // Now we build the substituted predicates.
let default_obligations = predicates.predicates.iter().flat_map(|&(pred, _)| { let default_obligations = predicates.predicates.iter().flat_map(|&(pred, _)| {
#[derive(Default)] #[derive(Default)]
struct CountParams { params: FxHashSet<u32> } struct CountParams { params: FxHashSet<u32> }
impl<'tcx> ty::fold::TypeVisitor<'tcx> for CountParams { impl<'tcx> ty::fold::TypeVisitor<'tcx> for CountParams {
fn visit_ty(&mut self, t: Ty<'tcx>) -> bool { fn visit_ty(&mut self, t: Ty<'tcx>) -> bool {
match t.sty { if let ty::Param(param) = t.sty {
ty::Param(p) => { self.params.insert(param.idx);
self.params.insert(p.idx);
t.super_visit_with(self)
}
_ => t.super_visit_with(self)
} }
t.super_visit_with(self)
} }
fn visit_region(&mut self, _: ty::Region<'tcx>) -> bool { fn visit_region(&mut self, _: ty::Region<'tcx>) -> bool {