merge need_type_info_err(_const)

2020-09-23 09:24:58 +02:00
parent e0bc267512
commit 45d92b43e3
13 changed files with 148 additions and 131 deletions
--- a/compiler/rustc_infer/src/infer/mod.rs
+++ b/compiler/rustc_infer/src/infer/mod.rs
@@ -1163,7 +1163,10 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
            }
            GenericParamDefKind::Const { .. } => {
                let origin = ConstVariableOrigin {
-                    kind: ConstVariableOriginKind::ConstParameterDefinition(param.name),
+                    kind: ConstVariableOriginKind::ConstParameterDefinition(
+                        param.name,
+                        param.def_id,
+                    ),
                    span,
                };
                let const_var_id =