Skip to content

Commit 78abc36

Browse files
committed
Merge branch 'sync_from_rust'
2 parents 69b3f5a + 0174cb1 commit 78abc36

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

src/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ pub(crate) fn has_ptr_meta<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool {
107107
return false;
108108
}
109109

110-
let tail = tcx.struct_tail_erasing_lifetimes(ty, ParamEnv::reveal_all());
110+
let tail = tcx.struct_tail_for_codegen(ty, ParamEnv::reveal_all());
111111
match tail.kind() {
112112
ty::Foreign(..) => false,
113113
ty::Str | ty::Slice(..) | ty::Dynamic(..) => true,

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#![warn(unused_lifetimes)]
1313
// tidy-alphabetical-end
1414

15+
extern crate ar_archive_writer;
1516
extern crate jobserver;
1617
#[macro_use]
1718
extern crate rustc_middle;

src/unsize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub(crate) fn unsized_info<'tcx>(
2222
old_info: Option<Value>,
2323
) -> Value {
2424
let (source, target) =
25-
fx.tcx.struct_lockstep_tails_erasing_lifetimes(source, target, ParamEnv::reveal_all());
25+
fx.tcx.struct_lockstep_tails_for_codegen(source, target, ParamEnv::reveal_all());
2626
match (&source.kind(), &target.kind()) {
2727
(&ty::Array(_, len), &ty::Slice(_)) => fx
2828
.bcx

0 commit comments

Comments
 (0)