Fix rebase conflict

Author: leoyvens

src/librustc_typeck/collect.rs

@@ -1037,6 +1037,7 @@ fn generics_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
             name: Symbol::intern("<closure_kind>"),
             def_id,
             has_default: false,
+            origin: ty::OriginOfTyParam::Other,
             object_lifetime_default: rl::Set1::Empty,
             pure_wrt_drop: false,
             synthetic: None,
@@ -1048,6 +1049,7 @@ fn generics_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
             name: Symbol::intern("<closure_signature>"),
             def_id,
             has_default: false,
+            origin: ty::OriginOfTyParam::Other,
             object_lifetime_default: rl::Set1::Empty,
             pure_wrt_drop: false,
             synthetic: None,