Skip to content

Commit 8cd9c2b

Browse files
committed
Stop re-exporting check_match::Constructor.
1 parent 30a3849 commit 8cd9c2b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/librustc_const_eval/check_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
pub use self::Constructor::*;
11+
use self::Constructor::*;
1212
use self::Usefulness::*;
1313
use self::WitnessPreference::*;
1414

src/librustc_trans/_match.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ use self::Opt::*;
189189
use self::FailureHandler::*;
190190

191191
use llvm::{ValueRef, BasicBlockRef};
192-
use rustc_const_eval::check_match::{self, StaticInliner};
192+
use rustc_const_eval::check_match::{self, Constructor, StaticInliner};
193193
use rustc_const_eval::{compare_lit_exprs, eval_const_expr};
194194
use middle::def::{Def, DefMap};
195195
use middle::def_id::DefId;
@@ -609,19 +609,19 @@ fn enter_opt<'a, 'p, 'blk, 'tcx>(
609609
let _indenter = indenter();
610610

611611
let ctor = match opt {
612-
&ConstantValue(ConstantExpr(expr), _) => check_match::ConstantValue(
612+
&ConstantValue(ConstantExpr(expr), _) => Constructor::ConstantValue(
613613
eval_const_expr(bcx.tcx(), &expr)
614614
),
615-
&ConstantRange(ConstantExpr(lo), ConstantExpr(hi), _) => check_match::ConstantRange(
615+
&ConstantRange(ConstantExpr(lo), ConstantExpr(hi), _) => Constructor::ConstantRange(
616616
eval_const_expr(bcx.tcx(), &lo),
617617
eval_const_expr(bcx.tcx(), &hi)
618618
),
619619
&SliceLengthEqual(n, _) =>
620-
check_match::Slice(n),
620+
Constructor::Slice(n),
621621
&SliceLengthGreaterOrEqual(before, after, _) =>
622-
check_match::SliceWithSubslice(before, after),
622+
Constructor::SliceWithSubslice(before, after),
623623
&Variant(_, _, def_id, _) =>
624-
check_match::Constructor::Variant(def_id)
624+
Constructor::Variant(def_id)
625625
};
626626

627627
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>,
12291229
Some(field_vals) => {
12301230
let pats = enter_match(bcx, dm, m, col, val, |pats|
12311231
check_match::specialize(&mcx, pats,
1232-
&check_match::Single, col,
1232+
&Constructor::Single, col,
12331233
field_vals.len())
12341234
);
12351235
let mut vals: Vec<_> = field_vals.into_iter()

0 commit comments

Comments
 (0)