diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-08-09 17:33:55 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-08-09 17:33:55 +0000 |
| commit | 78abc36ac0b7ea962bd8ac726cc7004fc25c1e22 (patch) | |
| tree | 71e877f90c8f79ce9e6127550b45346ccc6a0bfd | |
| parent | 69b3f5a426a5c1c05236a45b36f6679d95fbe01b (diff) | |
| parent | 0174cb193220fbe96fccaf595d63d08747dbbaab (diff) | |
| download | rust-78abc36ac0b7ea962bd8ac726cc7004fc25c1e22.tar.gz rust-78abc36ac0b7ea962bd8ac726cc7004fc25c1e22.zip | |
Merge branch 'sync_from_rust'
| -rw-r--r-- | src/common.rs | 2 | ||||
| -rw-r--r-- | src/lib.rs | 1 | ||||
| -rw-r--r-- | src/unsize.rs | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/common.rs b/src/common.rs index 09317139936..a1b29a42225 100644 --- a/src/common.rs +++ b/src/common.rs @@ -107,7 +107,7 @@ pub(crate) fn has_ptr_meta<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool { return false; } - let tail = tcx.struct_tail_erasing_lifetimes(ty, ParamEnv::reveal_all()); + let tail = tcx.struct_tail_for_codegen(ty, ParamEnv::reveal_all()); match tail.kind() { ty::Foreign(..) => false, ty::Str | ty::Slice(..) | ty::Dynamic(..) => true, diff --git a/src/lib.rs b/src/lib.rs index f737af25b62..21930fa2ddb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,6 +12,7 @@ #![warn(unused_lifetimes)] // tidy-alphabetical-end +extern crate ar_archive_writer; extern crate jobserver; #[macro_use] extern crate rustc_middle; diff --git a/src/unsize.rs b/src/unsize.rs index 967aa53abbd..e09cd16e89a 100644 --- a/src/unsize.rs +++ b/src/unsize.rs @@ -22,7 +22,7 @@ pub(crate) fn unsized_info<'tcx>( old_info: Option<Value>, ) -> Value { let (source, target) = - fx.tcx.struct_lockstep_tails_erasing_lifetimes(source, target, ParamEnv::reveal_all()); + fx.tcx.struct_lockstep_tails_for_codegen(source, target, ParamEnv::reveal_all()); match (&source.kind(), &target.kind()) { (&ty::Array(_, len), &ty::Slice(_)) => fx .bcx |