@@ -9,7 +9,7 @@ use rustc_errors::{
9
9
use rustc_hir:: ConstContext ;
10
10
use rustc_macros:: { Diagnostic , LintDiagnostic , Subdiagnostic } ;
11
11
use rustc_middle:: mir:: interpret:: {
12
- CheckInAllocMsg , CtfeProvenance , ExpectedKind , InterpError , InvalidMetaKind ,
12
+ CheckInAllocMsg , CtfeProvenance , ExpectedKind , InterpErrorKind , InvalidMetaKind ,
13
13
InvalidProgramInfo , Misalignment , Pointer , PointerKind , ResourceExhaustionInfo ,
14
14
UndefinedBehaviorInfo , UnsupportedOpInfo , ValidationErrorInfo ,
15
15
} ;
@@ -835,23 +835,23 @@ impl ReportErrorExt for UnsupportedOpInfo {
835
835
}
836
836
}
837
837
838
- impl < ' tcx > ReportErrorExt for InterpError < ' tcx > {
838
+ impl < ' tcx > ReportErrorExt for InterpErrorKind < ' tcx > {
839
839
fn diagnostic_message ( & self ) -> DiagMessage {
840
840
match self {
841
- InterpError :: UndefinedBehavior ( ub) => ub. diagnostic_message ( ) ,
842
- InterpError :: Unsupported ( e) => e. diagnostic_message ( ) ,
843
- InterpError :: InvalidProgram ( e) => e. diagnostic_message ( ) ,
844
- InterpError :: ResourceExhaustion ( e) => e. diagnostic_message ( ) ,
845
- InterpError :: MachineStop ( e) => e. diagnostic_message ( ) ,
841
+ InterpErrorKind :: UndefinedBehavior ( ub) => ub. diagnostic_message ( ) ,
842
+ InterpErrorKind :: Unsupported ( e) => e. diagnostic_message ( ) ,
843
+ InterpErrorKind :: InvalidProgram ( e) => e. diagnostic_message ( ) ,
844
+ InterpErrorKind :: ResourceExhaustion ( e) => e. diagnostic_message ( ) ,
845
+ InterpErrorKind :: MachineStop ( e) => e. diagnostic_message ( ) ,
846
846
}
847
847
}
848
848
fn add_args < G : EmissionGuarantee > ( self , diag : & mut Diag < ' _ , G > ) {
849
849
match self {
850
- InterpError :: UndefinedBehavior ( ub) => ub. add_args ( diag) ,
851
- InterpError :: Unsupported ( e) => e. add_args ( diag) ,
852
- InterpError :: InvalidProgram ( e) => e. add_args ( diag) ,
853
- InterpError :: ResourceExhaustion ( e) => e. add_args ( diag) ,
854
- InterpError :: MachineStop ( e) => e. add_args ( & mut |name, value| {
850
+ InterpErrorKind :: UndefinedBehavior ( ub) => ub. add_args ( diag) ,
851
+ InterpErrorKind :: Unsupported ( e) => e. add_args ( diag) ,
852
+ InterpErrorKind :: InvalidProgram ( e) => e. add_args ( diag) ,
853
+ InterpErrorKind :: ResourceExhaustion ( e) => e. add_args ( diag) ,
854
+ InterpErrorKind :: MachineStop ( e) => e. add_args ( & mut |name, value| {
855
855
diag. arg ( name, value) ;
856
856
} ) ,
857
857
}
0 commit comments