@@ -17,9 +17,9 @@ use tracing::trace;
17
17
use super :: memory:: MemoryKind ;
18
18
use super :: util:: ensure_monomorphic_enough;
19
19
use super :: {
20
- Allocation , CheckInAllocMsg , ConstAllocation , GlobalId , ImmTy , InterpCx , InterpResult ,
21
- MPlaceTy , Machine , OpTy , Pointer , PointerArithmetic , Provenance , Scalar , err_inval,
22
- err_ub_custom , err_unsup_format, interp_ok, throw_inval, throw_ub_custom, throw_ub_format,
20
+ Allocation , CheckInAllocMsg , ConstAllocation , GlobalId , ImmTy , InterpCx , InterpResult , Machine ,
21
+ OpTy , PlaceTy , Pointer , PointerArithmetic , Provenance , Scalar , err_inval, err_ub_custom ,
22
+ err_unsup_format, interp_ok, throw_inval, throw_ub_custom, throw_ub_format,
23
23
} ;
24
24
use crate :: fluent_generated as fluent;
25
25
@@ -112,7 +112,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
112
112
& mut self ,
113
113
instance : ty:: Instance < ' tcx > ,
114
114
args : & [ OpTy < ' tcx , M :: Provenance > ] ,
115
- dest : & MPlaceTy < ' tcx , M :: Provenance > ,
115
+ dest : & PlaceTy < ' tcx , M :: Provenance > ,
116
116
ret : Option < mir:: BasicBlock > ,
117
117
) -> InterpResult < ' tcx , bool > {
118
118
let instance_args = instance. args ;
@@ -587,7 +587,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
587
587
& mut self ,
588
588
a : & ImmTy < ' tcx , M :: Provenance > ,
589
589
b : & ImmTy < ' tcx , M :: Provenance > ,
590
- dest : & MPlaceTy < ' tcx , M :: Provenance > ,
590
+ dest : & PlaceTy < ' tcx , M :: Provenance > ,
591
591
) -> InterpResult < ' tcx > {
592
592
assert_eq ! ( a. layout. ty, b. layout. ty) ;
593
593
assert_matches ! ( a. layout. ty. kind( ) , ty:: Int ( ..) | ty:: Uint ( ..) ) ;
@@ -801,7 +801,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
801
801
fn float_min_intrinsic < F > (
802
802
& mut self ,
803
803
args : & [ OpTy < ' tcx , M :: Provenance > ] ,
804
- dest : & MPlaceTy < ' tcx , M :: Provenance > ,
804
+ dest : & PlaceTy < ' tcx , M :: Provenance > ,
805
805
) -> InterpResult < ' tcx , ( ) >
806
806
where
807
807
F : rustc_apfloat:: Float + rustc_apfloat:: FloatConvert < F > + Into < Scalar < M :: Provenance > > ,
@@ -822,7 +822,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
822
822
fn float_max_intrinsic < F > (
823
823
& mut self ,
824
824
args : & [ OpTy < ' tcx , M :: Provenance > ] ,
825
- dest : & MPlaceTy < ' tcx , M :: Provenance > ,
825
+ dest : & PlaceTy < ' tcx , M :: Provenance > ,
826
826
) -> InterpResult < ' tcx , ( ) >
827
827
where
828
828
F : rustc_apfloat:: Float + rustc_apfloat:: FloatConvert < F > + Into < Scalar < M :: Provenance > > ,
@@ -843,7 +843,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
843
843
fn float_minimum_intrinsic < F > (
844
844
& mut self ,
845
845
args : & [ OpTy < ' tcx , M :: Provenance > ] ,
846
- dest : & MPlaceTy < ' tcx , M :: Provenance > ,
846
+ dest : & PlaceTy < ' tcx , M :: Provenance > ,
847
847
) -> InterpResult < ' tcx , ( ) >
848
848
where
849
849
F : rustc_apfloat:: Float + rustc_apfloat:: FloatConvert < F > + Into < Scalar < M :: Provenance > > ,
@@ -859,7 +859,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
859
859
fn float_maximum_intrinsic < F > (
860
860
& mut self ,
861
861
args : & [ OpTy < ' tcx , M :: Provenance > ] ,
862
- dest : & MPlaceTy < ' tcx , M :: Provenance > ,
862
+ dest : & PlaceTy < ' tcx , M :: Provenance > ,
863
863
) -> InterpResult < ' tcx , ( ) >
864
864
where
865
865
F : rustc_apfloat:: Float + rustc_apfloat:: FloatConvert < F > + Into < Scalar < M :: Provenance > > ,
@@ -875,7 +875,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
875
875
fn float_copysign_intrinsic < F > (
876
876
& mut self ,
877
877
args : & [ OpTy < ' tcx , M :: Provenance > ] ,
878
- dest : & MPlaceTy < ' tcx , M :: Provenance > ,
878
+ dest : & PlaceTy < ' tcx , M :: Provenance > ,
879
879
) -> InterpResult < ' tcx , ( ) >
880
880
where
881
881
F : rustc_apfloat:: Float + rustc_apfloat:: FloatConvert < F > + Into < Scalar < M :: Provenance > > ,
@@ -890,7 +890,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
890
890
fn float_abs_intrinsic < F > (
891
891
& mut self ,
892
892
args : & [ OpTy < ' tcx , M :: Provenance > ] ,
893
- dest : & MPlaceTy < ' tcx , M :: Provenance > ,
893
+ dest : & PlaceTy < ' tcx , M :: Provenance > ,
894
894
) -> InterpResult < ' tcx , ( ) >
895
895
where
896
896
F : rustc_apfloat:: Float + rustc_apfloat:: FloatConvert < F > + Into < Scalar < M :: Provenance > > ,
0 commit comments