Fix rebase fallout

jonas-schievink · jonas-schievink · commit 1df764174d38 · 2020-03-23T19:47:24.000+01:00
diff --git a/src/librustc_ty/needs_drop.rs b/src/librustc_ty/needs_drop.rs
@@ -99,13 +99,13 @@ where
                         }
                     }
 
-                    ty::Generator(def_id, substs, _) => {
+                    ty::Generator(_, substs, _) => {
                         let substs = substs.as_generator();
-                        for upvar_ty in substs.upvar_tys(def_id, tcx) {
+                        for upvar_ty in substs.upvar_tys() {
                             queue_type(self, upvar_ty);
                         }
 
-                        let witness = substs.witness(def_id, tcx);
+                        let witness = substs.witness();
                         let interior_tys = match &witness.kind {
                             ty::GeneratorWitness(tys) => tcx.erase_late_bound_regions(tys),
                             _ => bug!(),

Original file line number	Diff line number	Diff line change
`@@ -99,13 +99,13 @@ where`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`- ty::Generator(def_id, substs, _) => {`
	`102`	`+ ty::Generator(_, substs, _) => {`
`103`	`103`	`let substs = substs.as_generator();`
`104`		`- for upvar_ty in substs.upvar_tys(def_id, tcx) {`
	`104`	`+ for upvar_ty in substs.upvar_tys() {`
`105`	`105`	`queue_type(self, upvar_ty);`
`106`	`106`	`}`
`107`	`107`
`108`		`- let witness = substs.witness(def_id, tcx);`
	`108`	`+ let witness = substs.witness();`
`109`	`109`	`let interior_tys = match &witness.kind {`
`110`	`110`	`ty::GeneratorWitness(tys) => tcx.erase_late_bound_regions(tys),`
`111`	`111`	`_ => bug!(),`