@@ -189,7 +189,7 @@ use self::Opt::*;
189
189
use self :: FailureHandler :: * ;
190
190
191
191
use llvm:: { ValueRef , BasicBlockRef } ;
192
- use rustc_const_eval:: check_match:: { self , StaticInliner } ;
192
+ use rustc_const_eval:: check_match:: { self , Constructor , StaticInliner } ;
193
193
use rustc_const_eval:: { compare_lit_exprs, eval_const_expr} ;
194
194
use middle:: def:: { Def , DefMap } ;
195
195
use middle:: def_id:: DefId ;
@@ -609,19 +609,19 @@ fn enter_opt<'a, 'p, 'blk, 'tcx>(
609
609
let _indenter = indenter ( ) ;
610
610
611
611
let ctor = match opt {
612
- & ConstantValue ( ConstantExpr ( expr) , _) => check_match :: ConstantValue (
612
+ & ConstantValue ( ConstantExpr ( expr) , _) => Constructor :: ConstantValue (
613
613
eval_const_expr ( bcx. tcx ( ) , & expr)
614
614
) ,
615
- & ConstantRange ( ConstantExpr ( lo) , ConstantExpr ( hi) , _) => check_match :: ConstantRange (
615
+ & ConstantRange ( ConstantExpr ( lo) , ConstantExpr ( hi) , _) => Constructor :: ConstantRange (
616
616
eval_const_expr ( bcx. tcx ( ) , & lo) ,
617
617
eval_const_expr ( bcx. tcx ( ) , & hi)
618
618
) ,
619
619
& SliceLengthEqual ( n, _) =>
620
- check_match :: Slice ( n) ,
620
+ Constructor :: Slice ( n) ,
621
621
& SliceLengthGreaterOrEqual ( before, after, _) =>
622
- check_match :: SliceWithSubslice ( before, after) ,
622
+ Constructor :: SliceWithSubslice ( before, after) ,
623
623
& Variant ( _, _, def_id, _) =>
624
- check_match :: Constructor :: Variant ( def_id)
624
+ Constructor :: Variant ( def_id)
625
625
} ;
626
626
627
627
let param_env = bcx. tcx ( ) . empty_parameter_environment ( ) ;
@@ -1229,7 +1229,7 @@ fn compile_submatch_continue<'a, 'p, 'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
1229
1229
Some ( field_vals) => {
1230
1230
let pats = enter_match ( bcx, dm, m, col, val, |pats|
1231
1231
check_match:: specialize ( & mcx, pats,
1232
- & check_match :: Single , col,
1232
+ & Constructor :: Single , col,
1233
1233
field_vals. len ( ) )
1234
1234
) ;
1235
1235
let mut vals: Vec < _ > = field_vals. into_iter ( )
0 commit comments