X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustc_traits%2Fdropck_outlives.rs;h=02b9b078fca912bad579091f42562644d17a0dd8;hb=555b2d92505cedfb433cf13e87d25273cd4c1def;hp=25ce5c8f9a6d86a5c77b3126292b86c14872609a;hpb=fa66b8a1540fc09928630e5d77537d5443c72af4;p=rust.git diff --git a/src/librustc_traits/dropck_outlives.rs b/src/librustc_traits/dropck_outlives.rs index 25ce5c8f9a6..02b9b078fca 100644 --- a/src/librustc_traits/dropck_outlives.rs +++ b/src/librustc_traits/dropck_outlives.rs @@ -18,7 +18,7 @@ } fn dropck_outlives<'tcx>( - tcx: TyCtxt<'_, 'tcx, 'tcx>, + tcx: TyCtxt<'tcx, 'tcx>, canonical_goal: CanonicalTyGoal<'tcx>, ) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, DropckOutlivesResult<'tcx>>>, NoSolution> { debug!("dropck_outlives(goal={:#?})", canonical_goal); @@ -146,8 +146,8 @@ fn dropck_outlives<'tcx>( /// Returns a set of constraints that needs to be satisfied in /// order for `ty` to be valid for destruction. -fn dtorck_constraint_for_ty<'a, 'gcx, 'tcx>( - tcx: TyCtxt<'a, 'gcx, 'tcx>, +fn dtorck_constraint_for_ty<'gcx, 'tcx>( + tcx: TyCtxt<'gcx, 'tcx>, span: Span, for_ty: Ty<'tcx>, depth: usize, @@ -279,8 +279,8 @@ fn dtorck_constraint_for_ty<'a, 'gcx, 'tcx>( } /// Calculates the dtorck constraint for a type. -crate fn adt_dtorck_constraint<'a, 'tcx>( - tcx: TyCtxt<'a, 'tcx, 'tcx>, +crate fn adt_dtorck_constraint<'tcx>( + tcx: TyCtxt<'tcx, 'tcx>, def_id: DefId, ) -> Result, NoSolution> { let def = tcx.adt_def(def_id);