remove thir::Visitor::visit_const
This commit is contained in:
@@ -426,7 +426,6 @@ pub enum ExprKind<'tcx> {
|
||||
ConstParam {
|
||||
literal: ty::Const<'tcx>,
|
||||
def_id: DefId,
|
||||
user_ty: Option<Canonical<'tcx, UserType<'tcx>>>,
|
||||
},
|
||||
// FIXME improve docs for `StaticRef` by distinguishing it from `NamedConst`
|
||||
/// A literal containing the address of a `static`.
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
use super::{
|
||||
Arm, Block, Expr, ExprKind, Guard, InlineAsmOperand, Pat, PatKind, Stmt, StmtKind, Thir,
|
||||
};
|
||||
use rustc_middle::ty::Const;
|
||||
|
||||
pub trait Visitor<'a, 'tcx: 'a>: Sized {
|
||||
fn thir(&self) -> &'a Thir<'tcx>;
|
||||
@@ -25,8 +24,6 @@ pub trait Visitor<'a, 'tcx: 'a>: Sized {
|
||||
fn visit_pat(&mut self, pat: &Pat<'tcx>) {
|
||||
walk_pat(self, pat);
|
||||
}
|
||||
|
||||
fn visit_const(&mut self, _cnst: Const<'tcx>) {}
|
||||
}
|
||||
|
||||
pub fn walk_expr<'a, 'tcx: 'a, V: Visitor<'a, 'tcx>>(visitor: &mut V, expr: &Expr<'tcx>) {
|
||||
@@ -94,9 +91,8 @@ pub fn walk_expr<'a, 'tcx: 'a, V: Visitor<'a, 'tcx>>(visitor: &mut V, expr: &Exp
|
||||
}
|
||||
}
|
||||
ConstBlock { did: _, substs: _ } => {}
|
||||
Repeat { value, count } => {
|
||||
Repeat { value, count: _ } => {
|
||||
visitor.visit_expr(&visitor.thir()[value]);
|
||||
visitor.visit_const(count);
|
||||
}
|
||||
Array { ref fields } | Tuple { ref fields } => {
|
||||
for &field in &**fields {
|
||||
@@ -125,7 +121,7 @@ pub fn walk_expr<'a, 'tcx: 'a, V: Visitor<'a, 'tcx>>(visitor: &mut V, expr: &Exp
|
||||
Literal { lit: _, neg: _ } => {}
|
||||
ScalarLiteral { lit: _, user_ty: _ } => {}
|
||||
NamedConst { def_id: _, substs: _, user_ty: _ } => {}
|
||||
ConstParam { literal: _, def_id: _, user_ty: _ } => {}
|
||||
ConstParam { literal: _, def_id: _ } => {}
|
||||
StaticRef { alloc_id: _, ty: _, def_id: _ } => {}
|
||||
InlineAsm { ref operands, template: _, options: _, line_spans: _ } => {
|
||||
for op in &**operands {
|
||||
@@ -212,11 +208,8 @@ pub fn walk_pat<'a, 'tcx: 'a, V: Visitor<'a, 'tcx>>(visitor: &mut V, pat: &Pat<'
|
||||
visitor.visit_pat(&subpattern.pattern);
|
||||
}
|
||||
}
|
||||
Constant { value } => visitor.visit_const(*value),
|
||||
Range(range) => {
|
||||
visitor.visit_const(range.lo);
|
||||
visitor.visit_const(range.hi);
|
||||
}
|
||||
Constant { value: _ } => {}
|
||||
Range(_) => {}
|
||||
Slice { prefix, slice, suffix } | Array { prefix, slice, suffix } => {
|
||||
for subpattern in prefix {
|
||||
visitor.visit_pat(&subpattern);
|
||||
|
||||
Reference in New Issue
Block a user