squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Clean up dropck_outlives PhantomData handling

Browse source
This commit is contained in:
varkor 2018-05-15 13:48:04 +01:00
parent 0a9371ab77
commit 39a68e9069
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/librustc_traits/dropck_outlives.rs
View file

@ -14,7 +14,7 @@ use rustc::traits::{FulfillmentContext, Normalized, ObligationCause};
use rustc::traits::query::{CanonicalTyGoal, NoSolution}; use rustc::traits::query::{CanonicalTyGoal, NoSolution};
use rustc::traits::query::dropck_outlives::{DtorckConstraint, DropckOutlivesResult}; use rustc::traits::query::dropck_outlives::{DtorckConstraint, DropckOutlivesResult};
use rustc::ty::{self, ParamEnvAnd, Ty, TyCtxt}; use rustc::ty::{self, ParamEnvAnd, Ty, TyCtxt};
use rustc::ty::subst::{UnpackedKind, Subst}; use rustc::ty::subst::{Subst, Substs};
use rustc::util::nodemap::FxHashSet; use rustc::util::nodemap::FxHashSet;
use rustc_data_structures::sync::Lrc; use rustc_data_structures::sync::Lrc;
use syntax::codemap::{Span, DUMMY_SP}; use syntax::codemap::{Span, DUMMY_SP};
@ -280,14 +280,11 @@ crate fn adt_dtorck_constraint<'a, 'tcx>(
if def.is_phantom_data() { if def.is_phantom_data() {
// The first generic parameter here is guaranteed to be a type because it's // The first generic parameter here is guaranteed to be a type because it's
// `PhantomData`. // `PhantomData`.
let param = &tcx.generics_of(def_id).params[0]; let substs = Substs::identity_for_item(tcx, def_id);
let ty = match tcx.mk_param_from_def(param).unpack() { assert_eq!(substs.len(), 1);
UnpackedKind::Type(ty) => ty,
_ => unreachable!(),
};
let result = DtorckConstraint { let result = DtorckConstraint {
outlives: vec![], outlives: vec![],
dtorck_types: vec![ty], dtorck_types: vec![substs.type_at(0)],
overflows: vec![], overflows: vec![],
}; };
debug!("dtorck_constraint: {:?} => {:?}", def, result); debug!("dtorck_constraint: {:?} => {:?}", def, result);