bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use associated_item_def_ids more

Browse source
This commit is contained in:
Matthew Jasper 2021-11-05 18:47:52 +00:00
parent 3ea84e879a
commit ba518ffdd3
7 changed files with 16 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_mir_dataflow/src/elaborate_drops.rs
View file

@ -604,7 +604,7 @@ where
debug!("destructor_call_block({:?}, {:?})", self, succ);
let tcx = self.tcx();
let drop_trait = tcx.require_lang_item(LangItem::Drop, None);
let drop_fn = tcx.associated_items(drop_trait).in_definition_order().next().unwrap();
let drop_fn = tcx.associated_item_def_ids(drop_trait)[0];
let ty = self.place_ty(self.place);
let substs = tcx.mk_substs_trait(ty, &[]);
@ -624,12 +624,7 @@ where
)],
terminator: Some(Terminator {
kind: TerminatorKind::Call {
func: Operand::function_handle(
tcx,
drop_fn.def_id,
substs,
self.source_info.span,
),
func: Operand::function_handle(tcx, drop_fn, substs, self.source_info.span),
args: vec![Operand::Move(Place::from(ref_place))],
destination: Some((unit_temp, succ)),
cleanup: unwind.into_option(),