Fix rebase fallout from so-called "existential types"

Author: varkor

src/librustc/infer/error_reporting/mod.rs

@@ -672,9 +672,8 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
         let mut num_supplied_defaults = 0;
         let mut type_params = generics.params.iter().rev().filter_map(|param| match param.kind {
             ty::GenericParamDefKind::Lifetime => None,
-            ty::GenericParamDefKind::Type { has_default, .. } => {
-                Some((param.def_id, has_default))
-            }
+            ty::GenericParamDefKind::Type { has_default, .. } => Some((param.def_id, has_default)),
+            ty::GenericParamDefKind::Const { .. } => None, // FIXME(const_generics): defaults
         }).peekable();
         let has_default = {
             let has_default = type_params.peek().map(|(_, has_default)| has_default);

src/librustc/infer/mod.rs

@@ -591,7 +591,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
         type_variables
             .unsolved_variables()
             .into_iter()
-            .map(|t| self.tcx.mk_var(t))
+            .map(|t| self.tcx.mk_ty_var(t))
             .chain(
                 (0..int_unification_table.len())
                     .map(|i| ty::IntVid { index: i as u32 })

src/librustc/middle/resolve_lifetime.rs

@@ -867,6 +867,10 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                         next_early_index += 1;
                         None
                     }
+                    GenericParamKind::Const { .. } => {
+                        next_early_index += 1;
+                        None
+                    }
                 }).collect();
 
                 let scope = Scope::Binder {

src/librustc_typeck/check/wfcheck.rs

@@ -620,7 +620,7 @@ fn check_existential_types<'a, 'fcx, 'gcx, 'tcx>(
                                             )
                                             .emit();
                                     },
-                                }, // match ty
+                                } // match ty
                                 ty::subst::UnpackedKind::Lifetime(region) => {
                                     let param_span = tcx.def_span(param.def_id);
                                     if let ty::ReStatic = region {
@@ -641,7 +641,11 @@ fn check_existential_types<'a, 'fcx, 'gcx, 'tcx>(
                                     } else {
                                         seen.entry(region).or_default().push(param_span);
                                     }
-                                },
+                                }
+                                ty::subst::UnpackedKind::Const(_) => {
+                                    // TODO(const_generics)
+                                    unimplemented!()
+                                }
                             } // match subst
                         } // for (subst, param)
                         for (_, spans) in seen {