bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Review feedback: expand comment and simplify some code.

Browse source
This commit is contained in:
Felix S. Klock II 2016-10-17 16:22:42 +02:00
parent 85d2e4d1d6
commit 0d8f7164bb
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustc_typeck/check/dropck.rs
View file

@ -520,8 +520,9 @@ enum DropckKind<'tcx> {
/// Assume all borrowed data access by dtor occurs as if Self has the /// Assume all borrowed data access by dtor occurs as if Self has the
/// type carried by this variant. In practice this means that some /// type carried by this variant. In practice this means that some
/// of the type parameters are remapped to `()`, because the developer /// of the type parameters are remapped to `()` (and some lifetime
/// has asserted that the destructor will not access their contents. /// parameters remapped to `'static`), because the developer has asserted
/// that the destructor will not access their contents.
RevisedSelf(Ty<'tcx>), RevisedSelf(Ty<'tcx>),
} }
@ -539,13 +540,8 @@ fn has_dtor_of_interest<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
// Find the `impl<..> Drop for _` to inspect any // Find the `impl<..> Drop for _` to inspect any
// attributes attached to the impl's generics. // attributes attached to the impl's generics.
let opt_dtor_method = adt_def.destructor(); let dtor_method = adt_def.destructor()
let dtor_method = if let Some(dtor_method) = opt_dtor_method { .expect("dtorck type without destructor impossible");
dtor_method
} else {
return DropckKind::BorrowedDataMustStrictlyOutliveSelf;
};
let method = tcx.impl_or_trait_item(dtor_method); let method = tcx.impl_or_trait_item(dtor_method);
let impl_id: DefId = method.container().id(); let impl_id: DefId = method.container().id();
let revised_ty = revise_self_ty(tcx, adt_def, impl_id, substs); let revised_ty = revise_self_ty(tcx, adt_def, impl_id, substs);