@@ -16,7 +16,6 @@ use rustc_middle::ty::{
1616 layout:: { HasParamEnv , LayoutOf } ,
1717 Ty ,
1818} ;
19- use rustc_span:: DUMMY_SP ;
2019use rustc_target:: abi:: Abi ;
2120use rustc_target:: abi:: Size ;
2221use smallvec:: SmallVec ;
@@ -714,12 +713,12 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
714713 let mut kind_str = format ! ( "{kind}" ) ;
715714 match kind {
716715 RefKind :: Unique { two_phase : false }
717- if !ty. is_unpin ( this. tcx . at ( DUMMY_SP ) , this. param_env ( ) ) =>
716+ if !ty. is_unpin ( * this. tcx , this. param_env ( ) ) =>
718717 {
719718 write ! ( kind_str, " (!Unpin pointee type {ty})" ) . unwrap ( )
720719 } ,
721720 RefKind :: Shared
722- if !ty. is_freeze ( this. tcx . at ( DUMMY_SP ) , this. param_env ( ) ) =>
721+ if !ty. is_freeze ( * this. tcx , this. param_env ( ) ) =>
723722 {
724723 write ! ( kind_str, " (!Freeze pointee type {ty})" ) . unwrap ( )
725724 } ,
@@ -834,7 +833,7 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
834833 // There could be existing unique pointers reborrowed from them that should remain valid!
835834 let perm = match kind {
836835 RefKind :: Unique { two_phase : false }
837- if place. layout . ty . is_unpin ( this. tcx . at ( DUMMY_SP ) , this. param_env ( ) ) =>
836+ if place. layout . ty . is_unpin ( * this. tcx , this. param_env ( ) ) =>
838837 {
839838 // Only if the type is unpin do we actually enforce uniqueness
840839 Permission :: Unique
0 commit comments