summaryrefslogtreecommitdiffstats
path: root/compiler/rustc_mir_transform/src/required_consts.rs
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/rustc_mir_transform/src/required_consts.rs')
-rw-r--r--compiler/rustc_mir_transform/src/required_consts.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/compiler/rustc_mir_transform/src/required_consts.rs b/compiler/rustc_mir_transform/src/required_consts.rs
index 243cb4635..abde6a47e 100644
--- a/compiler/rustc_mir_transform/src/required_consts.rs
+++ b/compiler/rustc_mir_transform/src/required_consts.rs
@@ -1,27 +1,27 @@
use rustc_middle::mir::visit::Visitor;
-use rustc_middle::mir::{Constant, ConstantKind, Location};
+use rustc_middle::mir::{Const, ConstOperand, Location};
use rustc_middle::ty::ConstKind;
pub struct RequiredConstsVisitor<'a, 'tcx> {
- required_consts: &'a mut Vec<Constant<'tcx>>,
+ required_consts: &'a mut Vec<ConstOperand<'tcx>>,
}
impl<'a, 'tcx> RequiredConstsVisitor<'a, 'tcx> {
- pub fn new(required_consts: &'a mut Vec<Constant<'tcx>>) -> Self {
+ pub fn new(required_consts: &'a mut Vec<ConstOperand<'tcx>>) -> Self {
RequiredConstsVisitor { required_consts }
}
}
impl<'tcx> Visitor<'tcx> for RequiredConstsVisitor<'_, 'tcx> {
- fn visit_constant(&mut self, constant: &Constant<'tcx>, _: Location) {
- let literal = constant.literal;
- match literal {
- ConstantKind::Ty(c) => match c.kind() {
+ fn visit_constant(&mut self, constant: &ConstOperand<'tcx>, _: Location) {
+ let const_ = constant.const_;
+ match const_ {
+ Const::Ty(c) => match c.kind() {
ConstKind::Param(_) | ConstKind::Error(_) | ConstKind::Value(_) => {}
_ => bug!("only ConstKind::Param/Value should be encountered here, got {:#?}", c),
},
- ConstantKind::Unevaluated(..) => self.required_consts.push(*constant),
- ConstantKind::Val(..) => {}
+ Const::Unevaluated(..) => self.required_consts.push(*constant),
+ Const::Val(..) => {}
}
}
}