bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add query for const_param_default

Browse source
This commit is contained in:
kadmin 2021-03-03 06:38:02 +00:00
parent 0e56a086f7
commit 9fe793ae5d
17 changed files with 108 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_typeck/src/astconv/mod.rs
View file

@ -505,10 +505,10 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
}
}
GenericParamDefKind::Const { has_default } => {
let ty = tcx.at(self.span).type_of(param.def_id);
if !infer_args && has_default {
ty::Const::from_anon_const(tcx, param.def_id.expect_local()).into()
tcx.const_param_default(param.def_id).into()
} else {
let ty = tcx.at(self.span).type_of(param.def_id);
if infer_args {
self.astconv.ct_infer(ty, Some(param), self.span).into()
} else {

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

@ -1445,7 +1445,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
GenericParamDefKind::Const { has_default, .. } => {
if !infer_args && has_default {
ty::Const::from_anon_const(tcx, param.def_id.expect_local()).into()
tcx.const_param_default(param.def_id).into()
} else {
self.fcx.var_for_def(self.span, param)
}

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

@ -774,7 +774,7 @@ fn check_where_clauses<'tcx, 'fcx>(
}
GenericParamDefKind::Const { .. } => {
if is_our_default(param) {
let default_ct = ty::Const::from_anon_const(tcx, param.def_id.expect_local());
let default_ct = tcx.const_param_default(param.def_id);
// Const params have to currently be concrete.
assert!(!default_ct.needs_subst());
default_ct.into()

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

@ -257,10 +257,11 @@ impl Visitor<'tcx> for CollectItemTypesVisitor<'tcx> {
hir::GenericParamKind::Const { default, .. } => {
let def_id = self.tcx.hir().local_def_id(param.hir_id);
self.tcx.ensure().type_of(def_id);
// FIXME(const_generics_defaults)
if let Some(default) = default {
let def_id = self.tcx.hir().local_def_id(default.hir_id);
// need to store default and type of default
self.tcx.ensure().type_of(def_id);
self.tcx.ensure().const_param_default(def_id);
}
}
}