Skip to content

Commit 9fcab6b

Browse files
nbdd0121nbdd0121
committed
require_lang_item now always take a span
1 parent 3deccbd commit 9fcab6b

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

‎src/mir/elaborate_drop.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ where
249249
// Resolving obj.<AsyncDrop::drop>()
250250
let trait_ref = ty::TraitRef::new(
251251
tcx,
252-
tcx.require_lang_item(LangItem::AsyncDrop, Some(span)),
252+
tcx.require_lang_item(LangItem::AsyncDrop, span),
253253
[drop_ty],
254254
);
255255
let (drop_trait, trait_args) = match tcx.codegen_select_candidate(
@@ -271,7 +271,7 @@ where
271271
(sig.output(), drop_fn_def_id, trait_args)
272272
} else {
273273
// Resolving async_drop_in_place<T> function for drop_ty
274-
let drop_fn_def_id = tcx.require_lang_item(LangItem::AsyncDropInPlace, Some(span));
274+
let drop_fn_def_id = tcx.require_lang_item(LangItem::AsyncDropInPlace, span);
275275
let trait_args = tcx.mk_args(&[drop_ty.into()]);
276276
let sig = tcx.fn_sig(drop_fn_def_id).instantiate(tcx, trait_args);
277277
let sig = tcx.instantiate_bound_regions_with_erased(sig);
@@ -300,7 +300,7 @@ where
300300
// pin_obj_place preparation
301301
let pin_obj_new_unchecked_fn = Ty::new_fn_def(
302302
tcx,
303-
tcx.require_lang_item(LangItem::PinNewUnchecked, Some(span)),
303+
tcx.require_lang_item(LangItem::PinNewUnchecked, span),
304304
[GenericArg::from(obj_ref_ty)],
305305
);
306306
let pin_obj_ty = pin_obj_new_unchecked_fn
@@ -954,7 +954,7 @@ where
954954
fn destructor_call_block_sync(&mut self, (succ, unwind): (BasicBlock, Unwind)) -> BasicBlock {
955955
debug!("destructor_call_block({:?}, {:?})", self, succ);
956956
let tcx = self.tcx();
957-
let drop_trait = tcx.require_lang_item(LangItem::Drop, None);
957+
let drop_trait = tcx.require_lang_item(LangItem::Drop, DUMMY_SP);
958958
let drop_fn = tcx.associated_item_def_ids(drop_trait)[0];
959959
let ty = self.place_ty(self.place);
960960

‎src/monomorphize_collector.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fn custom_coerce_unsize_info<'tcx>(
4444
) -> Result<CustomCoerceUnsized, ErrorGuaranteed> {
4545
let trait_ref = ty::TraitRef::new(
4646
tcx.tcx,
47-
tcx.require_lang_item(LangItem::CoerceUnsized, Some(tcx.span)),
47+
tcx.require_lang_item(LangItem::CoerceUnsized, tcx.span),
4848
[source_ty, target_ty],
4949
);
5050

@@ -532,7 +532,7 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirUsedCollector<'a, 'tcx> {
532532

533533
let tcx = self.tcx;
534534
let push_mono_lang_item = |this: &mut Self, lang_item: LangItem| {
535-
let instance = Instance::mono(tcx, tcx.require_lang_item(lang_item, Some(source)));
535+
let instance = Instance::mono(tcx, tcx.require_lang_item(lang_item, source));
536536
this.output.push(create_fn_mono_item(tcx, instance, source));
537537
};
538538

@@ -994,7 +994,7 @@ impl<'v> RootCollector<'_, 'v> {
994994
return;
995995
};
996996

997-
let start_def_id = self.tcx.require_lang_item(LangItem::Start, None);
997+
let start_def_id = self.tcx.require_lang_item(LangItem::Start, DUMMY_SP);
998998
let main_ret_ty = self
999999
.tcx
10001000
.fn_sig(main_def_id)

‎src/preempt_count/adjustment.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use rustc_middle::ty::{
1111
};
1212
use rustc_mir_dataflow::Analysis;
1313
use rustc_mir_dataflow::JoinSemiLattice;
14+
use rustc_span::DUMMY_SP;
1415
use rustc_trait_selection::infer::TyCtxtInferExt;
1516

1617
use super::dataflow::{AdjustmentBoundsOrError, AdjustmentComputation};
@@ -388,7 +389,7 @@ memoize!(
388389

389390
_ if let Some(boxed_ty) = ty.boxed_ty() => {
390391
let adj = cx.drop_adjustment(typing_env.as_query_input(boxed_ty))?;
391-
let drop_trait = cx.require_lang_item(LangItem::Drop, None);
392+
let drop_trait = cx.require_lang_item(LangItem::Drop, DUMMY_SP);
392393
let drop_fn = cx.associated_item_def_ids(drop_trait)[0];
393394
let box_free = ty::Instance::try_resolve(
394395
cx.tcx,
@@ -488,7 +489,7 @@ memoize!(
488489
}
489490

490491
// Do not call `resolve_drop_in_place` because we need typing_env.
491-
let drop_in_place = cx.require_lang_item(LangItem::DropInPlace, None);
492+
let drop_in_place = cx.require_lang_item(LangItem::DropInPlace, DUMMY_SP);
492493
let args = cx.mk_args(&[ty.into()]);
493494
let instance = ty::Instance::try_resolve(cx.tcx, typing_env, drop_in_place, args)
494495
.unwrap()
@@ -609,7 +610,7 @@ memoize!(
609610
}
610611

611612
// Do not call `resolve_drop_in_place` because we need typing_env.
612-
let drop_in_place = cx.require_lang_item(LangItem::DropInPlace, None);
613+
let drop_in_place = cx.require_lang_item(LangItem::DropInPlace, DUMMY_SP);
613614
let args = cx.mk_args(&[ty.into()]);
614615
let instance = ty::Instance::try_resolve(cx.tcx, typing_env, drop_in_place, args)
615616
.unwrap()

‎src/preempt_count/check.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use rustc_middle::ty::{
1212
self, GenericArgs, GenericParamDefKind, Instance, PseudoCanonicalInput, Ty, TyCtxt,
1313
TypeFoldable, TypeVisitableExt, TypingEnv, Upcast,
1414
};
15-
use rustc_span::Span;
15+
use rustc_span::{DUMMY_SP, Span};
1616

1717
use super::{Error, PolyDisplay, UseSite, UseSiteKind};
1818
use crate::ctxt::AnalysisCtxt;
@@ -685,7 +685,7 @@ memoize!(
685685

686686
_ if let Some(boxed_ty) = ty.boxed_ty() => {
687687
cx.drop_check(typing_env.as_query_input(boxed_ty))?;
688-
let drop_trait = cx.require_lang_item(LangItem::Drop, None);
688+
let drop_trait = cx.require_lang_item(LangItem::Drop, DUMMY_SP);
689689
let drop_fn = cx.associated_item_def_ids(drop_trait)[0];
690690
let box_free = ty::Instance::try_resolve(
691691
cx.tcx,
@@ -728,7 +728,7 @@ memoize!(
728728
}
729729

730730
// Do not call `resolve_drop_in_place` because we need typing_env.
731-
let drop_in_place = cx.require_lang_item(LangItem::DropInPlace, None);
731+
let drop_in_place = cx.require_lang_item(LangItem::DropInPlace, DUMMY_SP);
732732
let args = cx.mk_args(&[ty.into()]);
733733
let instance = ty::Instance::try_resolve(cx.tcx, typing_env, drop_in_place, args)
734734
.unwrap()

‎src/preempt_count/expectation.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ impl<'tcx> AnalysisCtxt<'tcx> {
372372
}
373373
let adj = self.drop_adjustment(typing_env.as_query_input(boxed_ty))?;
374374

375-
let drop_trait = self.require_lang_item(LangItem::Drop, None);
375+
let drop_trait = self.require_lang_item(LangItem::Drop, DUMMY_SP);
376376
let drop_fn = self.associated_item_def_ids(drop_trait)[0];
377377
let box_free = ty::Instance::try_resolve(
378378
self.tcx,
@@ -470,7 +470,7 @@ impl<'tcx> AnalysisCtxt<'tcx> {
470470
let span = MultiSpan::new();
471471

472472
// Do not call `resolve_drop_in_place` because we need typing_env.
473-
let drop_in_place = self.require_lang_item(LangItem::DropInPlace, None);
473+
let drop_in_place = self.require_lang_item(LangItem::DropInPlace, DUMMY_SP);
474474
let args = self.mk_args(&[ty.into()]);
475475
let instance = ty::Instance::try_resolve(self.tcx, typing_env, drop_in_place, args)
476476
.unwrap()
@@ -685,7 +685,7 @@ memoize!(
685685

686686
_ if let Some(boxed_ty) = ty.boxed_ty() => {
687687
let exp = cx.drop_expectation(typing_env.as_query_input(boxed_ty))?;
688-
let drop_trait = cx.require_lang_item(LangItem::Drop, None);
688+
let drop_trait = cx.require_lang_item(LangItem::Drop, DUMMY_SP);
689689
let drop_fn = cx.associated_item_def_ids(drop_trait)[0];
690690
let box_free = ty::Instance::try_resolve(
691691
cx.tcx,
@@ -822,7 +822,7 @@ memoize!(
822822
}
823823

824824
// Do not call `resolve_drop_in_place` because we need typing_env.
825-
let drop_in_place = cx.require_lang_item(LangItem::DropInPlace, None);
825+
let drop_in_place = cx.require_lang_item(LangItem::DropInPlace, DUMMY_SP);
826826
let args = cx.mk_args(&[ty.into()]);
827827
let instance = ty::Instance::try_resolve(cx.tcx, typing_env, drop_in_place, args)
828828
.unwrap()
@@ -948,7 +948,7 @@ memoize!(
948948
}
949949

950950
// Do not call `resolve_drop_in_place` because we need typing_env.
951-
let drop_in_place = cx.require_lang_item(LangItem::DropInPlace, None);
951+
let drop_in_place = cx.require_lang_item(LangItem::DropInPlace, DUMMY_SP);
952952
let args = cx.mk_args(&[ty.into()]);
953953
let instance = ty::Instance::try_resolve(cx.tcx, typing_env, drop_in_place, args)
954954
.unwrap()

0 commit comments

Comments
 (0)