Skip to content

Commit 8c921be

Browse files
committed
Apply review comments
1 parent 82f2b37 commit 8c921be

File tree

9 files changed

+21
-6
lines changed

9 files changed

+21
-6
lines changed

src/librustc_mir/transform/qualify_consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1754,7 +1754,7 @@ impl<'tcx> MirPass<'tcx> for QualifyAndPromoteConstants<'tcx> {
17541754
ty,
17551755
tcx.require_lang_item(
17561756
lang_items::SyncTraitLangItem,
1757-
None
1757+
Some(body.span)
17581758
),
17591759
cause);
17601760
if let Err(err) = fulfillment_cx.select_all_or_error(&infcx) {

src/librustc_mir/util/elaborate_drops.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,10 @@ where
897897
) -> BasicBlock {
898898
let tcx = self.tcx();
899899
let unit_temp = Place::from(self.new_temp(tcx.mk_unit()));
900-
let free_func = tcx.require_lang_item(lang_items::BoxFreeFnLangItem, None);
900+
let free_func = tcx.require_lang_item(
901+
lang_items::BoxFreeFnLangItem,
902+
Some(self.source_info.span)
903+
);
901904
let args = adt.variants[VariantIdx::new(0)].fields.iter().enumerate().map(|(i, f)| {
902905
let field = Field::new(i);
903906
let field_ty = f.ty(self.tcx(), substs);

src/librustc_typeck/check/cast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ impl<'a, 'tcx> CastCheck<'tcx> {
649649

650650
impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
651651
fn type_is_known_to_be_sized_modulo_regions(&self, ty: Ty<'tcx>, span: Span) -> bool {
652-
let lang_item = self.tcx.require_lang_item(lang_items::SizedTraitLangItem, None);
652+
let lang_item = self.tcx.require_lang_item(lang_items::SizedTraitLangItem, Some(span));
653653
traits::type_known_to_meet_bound_modulo_regions(self, self.param_env, ty, lang_item, span)
654654
}
655655
}

src/librustc_typeck/check/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2622,7 +2622,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
26222622
span: Span,
26232623
code: traits::ObligationCauseCode<'tcx>)
26242624
{
2625-
let lang_item = self.tcx.require_lang_item(lang_items::SizedTraitLangItem, None);
2625+
let lang_item = self.tcx.require_lang_item(lang_items::SizedTraitLangItem, Some(span));
26262626
self.require_type_meets(ty, span, code, lang_item);
26272627
}
26282628

src/test/ui/lang-item-missing.stderr

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
error: requires `sized` lang_item
2+
--> $DIR/lang-item-missing.rs:10:50
3+
|
4+
LL | fn start(argc: isize, argv: *const *const u8) -> isize {
5+
| ^^^^^
26

37
error: aborting due to previous error
48

src/test/ui/privacy/privacy2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mod bar {
1111
}
1212
}
1313

14-
pub fn foo() {}
14+
pub fn foo() {} //~ ERROR: requires `sized` lang_item
1515

1616
fn test1() {
1717
use bar::foo;

src/test/ui/privacy/privacy2.stderr

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ LL | use bar::glob::foo;
1111
| ^^^
1212

1313
error: requires `sized` lang_item
14+
--> $DIR/privacy2.rs:14:14
15+
|
16+
LL | pub fn foo() {}
17+
| ^
1418

1519
error: aborting due to 3 previous errors
1620

src/test/ui/privacy/privacy3.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mod bar {
88
pub use self::glob::*;
99

1010
mod glob {
11-
fn gpriv() {}
11+
fn gpriv() {} //~ ERROR: requires `sized` lang_item
1212
}
1313
}
1414

src/test/ui/privacy/privacy3.stderr

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ LL | use bar::gpriv;
55
| ^^^^^^^^^^ no `gpriv` in `bar`
66

77
error: requires `sized` lang_item
8+
--> $DIR/privacy3.rs:11:20
9+
|
10+
LL | fn gpriv() {}
11+
| ^
812

913
error: aborting due to 2 previous errors
1014

0 commit comments

Comments
 (0)