//! normal visitor, which just walks the entire body in one shot, the
//! `ExprUseVisitor` determines how expressions are being used.
-pub use self::LoanCause::*;
pub use self::ConsumeMode::*;
-pub use self::MoveReason::*;
-pub use self::MatchMode::*;
-use self::TrackMatchMode::*;
use self::OverloadedCallType::*;
-use crate::hir::def::{CtorOf, Res, DefKind};
+use crate::hir::def::Res;
use crate::hir::def_id::DefId;
use crate::hir::ptr::P;
use crate::infer::InferCtxt;
use crate::middle::mem_categorization as mc;
use crate::middle::region;
-use crate::ty::{self, DefIdTree, TyCtxt, adjustment};
+use crate::ty::{self, TyCtxt, adjustment};
use crate::hir::{self, PatKind};
use std::rc::Rc;
pub trait Delegate<'tcx> {
// The value found at `cmt` is either copied or moved, depending
// on mode.
- fn consume(&mut self,
- consume_id: hir::HirId,
- consume_span: Span,
- cmt: &mc::cmt_<'tcx>,
- mode: ConsumeMode);
-
- // The value found at `cmt` has been determined to match the
- // pattern binding `matched_pat`, and its subparts are being
- // copied or moved depending on `mode`. Note that `matched_pat`
- // is called on all variant/structs in the pattern (i.e., the
- // interior nodes of the pattern's tree structure) while
- // consume_pat is called on the binding identifiers in the pattern
- // (which are leaves of the pattern's tree structure).
- //
- // Note that variants/structs and identifiers are disjoint; thus
- // `matched_pat` and `consume_pat` are never both called on the
- // same input pattern structure (though of `consume_pat` can be
- // called on a subpart of an input passed to `matched_pat).
- fn matched_pat(&mut self,
- matched_pat: &hir::Pat,
- cmt: &mc::cmt_<'tcx>,
- mode: MatchMode);
-
- // The value found at `cmt` is either copied or moved via the
- // pattern binding `consume_pat`, depending on mode.
- fn consume_pat(&mut self,
- consume_pat: &hir::Pat,
- cmt: &mc::cmt_<'tcx>,
- mode: ConsumeMode);
-
- // The value found at `borrow` is being borrowed at the point
- // `borrow_id` for the region `loan_region` with kind `bk`.
- fn borrow(&mut self,
- borrow_id: hir::HirId,
- borrow_span: Span,
- cmt: &mc::cmt_<'tcx>,
- loan_region: ty::Region<'tcx>,
- bk: ty::BorrowKind,
- loan_cause: LoanCause);
-
- // The local variable `id` is declared but not initialized.
- fn decl_without_init(&mut self,
- id: hir::HirId,
- span: Span);
+ fn consume(&mut self, cmt: &mc::cmt_<'tcx>, mode: ConsumeMode);
- // The path at `cmt` is being assigned to.
- fn mutate(&mut self,
- assignment_id: hir::HirId,
- assignment_span: Span,
- assignee_cmt: &mc::cmt_<'tcx>,
- mode: MutateMode);
-
- // A nested closure or generator - only one layer deep.
- fn nested_body(&mut self, _body_id: hir::BodyId) {}
-}
+ // The value found at `cmt` is being borrowed with kind `bk`.
+ fn borrow(&mut self, cmt: &mc::cmt_<'tcx>, bk: ty::BorrowKind);
-#[derive(Copy, Clone, PartialEq, Debug)]
-pub enum LoanCause {
- ClosureCapture(Span),
- AddrOf,
- AutoRef,
- AutoUnsafe,
- RefBinding,
- OverloadedOperator,
- ClosureInvocation,
- ForLoop,
- MatchDiscriminant
+ // The path at `cmt` is being assigned to.
+ fn mutate(&mut self, assignee_cmt: &mc::cmt_<'tcx>);
}
#[derive(Copy, Clone, PartialEq, Debug)]
pub enum ConsumeMode {
Copy, // reference to x where x has a type that copies
- Move(MoveReason), // reference to x where x has a type that moves
-}
-
-#[derive(Copy, Clone, PartialEq, Debug)]
-pub enum MoveReason {
- DirectRefMove,
- PatBindingMove,
- CaptureMove,
-}
-
-#[derive(Copy, Clone, PartialEq, Debug)]
-pub enum MatchMode {
- NonBindingMatch,
- BorrowingMatch,
- CopyingMatch,
- MovingMatch,
-}
-
-#[derive(Copy, Clone, PartialEq, Debug)]
-enum TrackMatchMode {
- Unknown,
- Definite(MatchMode),
- Conflicting,
-}
-
-impl TrackMatchMode {
- // Builds up the whole match mode for a pattern from its constituent
- // parts. The lattice looks like this:
- //
- // Conflicting
- // / \
- // / \
- // Borrowing Moving
- // \ /
- // \ /
- // Copying
- // |
- // NonBinding
- // |
- // Unknown
- //
- // examples:
- //
- // * `(_, some_int)` pattern is Copying, since
- // NonBinding + Copying => Copying
- //
- // * `(some_int, some_box)` pattern is Moving, since
- // Copying + Moving => Moving
- //
- // * `(ref x, some_box)` pattern is Conflicting, since
- // Borrowing + Moving => Conflicting
- //
- // Note that the `Unknown` and `Conflicting` states are
- // represented separately from the other more interesting
- // `Definite` states, which simplifies logic here somewhat.
- fn lub(&mut self, mode: MatchMode) {
- *self = match (*self, mode) {
- // Note that clause order below is very significant.
- (Unknown, new) => Definite(new),
- (Definite(old), new) if old == new => Definite(old),
-
- (Definite(old), NonBindingMatch) => Definite(old),
- (Definite(NonBindingMatch), new) => Definite(new),
-
- (Definite(old), CopyingMatch) => Definite(old),
- (Definite(CopyingMatch), new) => Definite(new),
-
- (Definite(_), _) => Conflicting,
- (Conflicting, _) => *self,
- };
- }
-
- fn match_mode(&self) -> MatchMode {
- match *self {
- Unknown => NonBindingMatch,
- Definite(mode) => mode,
- Conflicting => {
- // Conservatively return MovingMatch to let the
- // compiler continue to make progress.
- MovingMatch
- }
- }
- }
+ Move, // reference to x where x has a type that moves
}
#[derive(Copy, Clone, PartialEq, Debug)]
self.mc.tcx
}
- fn delegate_consume(&mut self,
- consume_id: hir::HirId,
- consume_span: Span,
- cmt: &mc::cmt_<'tcx>) {
- debug!("delegate_consume(consume_id={}, cmt={:?})",
- consume_id, cmt);
+ fn delegate_consume(&mut self, cmt: &mc::cmt_<'tcx>) {
+ debug!("delegate_consume(cmt={:?})", cmt);
- let mode = copy_or_move(&self.mc, self.param_env, cmt, DirectRefMove);
- self.delegate.consume(consume_id, consume_span, cmt, mode);
+ let mode = copy_or_move(&self.mc, self.param_env, cmt);
+ self.delegate.consume(cmt, mode);
}
fn consume_exprs(&mut self, exprs: &[hir::Expr]) {
debug!("consume_expr(expr={:?})", expr);
let cmt = return_if_err!(self.mc.cat_expr(expr));
- self.delegate_consume(expr.hir_id, expr.span, &cmt);
+ self.delegate_consume(&cmt);
self.walk_expr(expr);
}
- fn mutate_expr(&mut self,
- span: Span,
- assignment_expr: &hir::Expr,
- expr: &hir::Expr,
- mode: MutateMode) {
+ fn mutate_expr(&mut self, expr: &hir::Expr) {
let cmt = return_if_err!(self.mc.cat_expr(expr));
- self.delegate.mutate(assignment_expr.hir_id, span, &cmt, mode);
+ self.delegate.mutate(&cmt);
self.walk_expr(expr);
}
- fn borrow_expr(&mut self,
- expr: &hir::Expr,
- r: ty::Region<'tcx>,
- bk: ty::BorrowKind,
- cause: LoanCause) {
- debug!("borrow_expr(expr={:?}, r={:?}, bk={:?})",
- expr, r, bk);
+ fn borrow_expr(&mut self, expr: &hir::Expr, bk: ty::BorrowKind) {
+ debug!("borrow_expr(expr={:?}, bk={:?})", expr, bk);
let cmt = return_if_err!(self.mc.cat_expr(expr));
- self.delegate.borrow(expr.hir_id, expr.span, &cmt, r, bk, cause);
+ self.delegate.borrow(&cmt, bk);
self.walk_expr(expr)
}
hir::ExprKind::Path(_) => { }
hir::ExprKind::Type(ref subexpr, _) => {
- self.walk_expr(&subexpr)
+ self.walk_expr(subexpr)
}
hir::ExprKind::Unary(hir::UnDeref, ref base) => { // *base
- self.select_from_expr(&base);
+ self.select_from_expr(base);
}
hir::ExprKind::Field(ref base, _) => { // base.f
- self.select_from_expr(&base);
+ self.select_from_expr(base);
}
hir::ExprKind::Index(ref lhs, ref rhs) => { // lhs[rhs]
- self.select_from_expr(&lhs);
- self.consume_expr(&rhs);
+ self.select_from_expr(lhs);
+ self.consume_expr(rhs);
}
hir::ExprKind::Call(ref callee, ref args) => { // callee(args)
- self.walk_callee(expr, &callee);
+ self.walk_callee(expr, callee);
self.consume_exprs(args);
}
hir::ExprKind::Match(ref discr, ref arms, _) => {
let discr_cmt = Rc::new(return_if_err!(self.mc.cat_expr(&discr)));
- let r = self.tcx().lifetimes.re_empty;
- self.borrow_expr(&discr, r, ty::ImmBorrow, MatchDiscriminant);
+ self.borrow_expr(&discr, ty::ImmBorrow);
// treatment of the discriminant is handled while walking the arms.
for arm in arms {
- let mode = self.arm_move_mode(discr_cmt.clone(), arm);
- let mode = mode.match_mode();
- self.walk_arm(discr_cmt.clone(), arm, mode);
+ self.walk_arm(discr_cmt.clone(), arm);
}
}
hir::ExprKind::AddrOf(m, ref base) => { // &base
// make sure that the thing we are pointing out stays valid
// for the lifetime `scope_r` of the resulting ptr:
- let expr_ty = return_if_err!(self.mc.expr_ty(expr));
- if let ty::Ref(r, _, _) = expr_ty.kind {
- let bk = ty::BorrowKind::from_mutbl(m);
- self.borrow_expr(&base, r, bk, AddrOf);
- }
+ let bk = ty::BorrowKind::from_mutbl(m);
+ self.borrow_expr(&base, bk);
}
hir::ExprKind::InlineAsm(ref ia, ref outputs, ref inputs) => {
if o.is_indirect {
self.consume_expr(output);
} else {
- self.mutate_expr(
- output.span,
- expr,
- output,
- if o.is_rw {
- MutateMode::WriteAndRead
- } else {
- MutateMode::JustWrite
- },
- );
+ self.mutate_expr(output);
}
}
self.consume_exprs(inputs);
hir::ExprKind::Err => {}
hir::ExprKind::Loop(ref blk, _, _) => {
- self.walk_block(&blk);
+ self.walk_block(blk);
}
hir::ExprKind::Unary(_, ref lhs) => {
- self.consume_expr(&lhs);
+ self.consume_expr(lhs);
}
hir::ExprKind::Binary(_, ref lhs, ref rhs) => {
- self.consume_expr(&lhs);
- self.consume_expr(&rhs);
+ self.consume_expr(lhs);
+ self.consume_expr(rhs);
}
hir::ExprKind::Block(ref blk, _) => {
- self.walk_block(&blk);
+ self.walk_block(blk);
}
hir::ExprKind::Break(_, ref opt_expr) | hir::ExprKind::Ret(ref opt_expr) => {
if let Some(ref expr) = *opt_expr {
- self.consume_expr(&expr);
+ self.consume_expr(expr);
}
}
hir::ExprKind::Assign(ref lhs, ref rhs) => {
- self.mutate_expr(expr.span, expr, &lhs, MutateMode::JustWrite);
- self.consume_expr(&rhs);
+ self.mutate_expr(lhs);
+ self.consume_expr(rhs);
}
hir::ExprKind::Cast(ref base, _) => {
- self.consume_expr(&base);
+ self.consume_expr(base);
}
hir::ExprKind::DropTemps(ref expr) => {
- self.consume_expr(&expr);
+ self.consume_expr(expr);
}
hir::ExprKind::AssignOp(_, ref lhs, ref rhs) => {
if self.mc.tables.is_method_call(expr) {
self.consume_expr(lhs);
} else {
- self.mutate_expr(expr.span, expr, &lhs, MutateMode::WriteAndRead);
+ self.mutate_expr(lhs);
}
- self.consume_expr(&rhs);
+ self.consume_expr(rhs);
}
hir::ExprKind::Repeat(ref base, _) => {
- self.consume_expr(&base);
+ self.consume_expr(base);
}
- hir::ExprKind::Closure(_, _, body_id, fn_decl_span, _) => {
- self.delegate.nested_body(body_id);
+ hir::ExprKind::Closure(_, _, _, fn_decl_span, _) => {
self.walk_captures(expr, fn_decl_span);
}
hir::ExprKind::Box(ref base) => {
- self.consume_expr(&base);
+ self.consume_expr(base);
}
hir::ExprKind::Yield(ref value, _) => {
- self.consume_expr(&value);
+ self.consume_expr(value);
}
}
}
ty::Error => { }
_ => {
if let Some(def_id) = self.mc.tables.type_dependent_def_id(call.hir_id) {
- let call_scope = region::Scope {
- id: call.hir_id.local_id,
- data: region::ScopeData::Node
- };
match OverloadedCallType::from_method_id(self.tcx(), def_id) {
FnMutOverloadedCall => {
- let call_scope_r = self.tcx().mk_region(ty::ReScope(call_scope));
- self.borrow_expr(callee,
- call_scope_r,
- ty::MutBorrow,
- ClosureInvocation);
+ self.borrow_expr(callee, ty::MutBorrow);
}
FnOverloadedCall => {
- let call_scope_r = self.tcx().mk_region(ty::ReScope(call_scope));
- self.borrow_expr(callee,
- call_scope_r,
- ty::ImmBorrow,
- ClosureInvocation);
+ self.borrow_expr(callee, ty::ImmBorrow);
}
FnOnceOverloadedCall => self.consume_expr(callee),
}
}
fn walk_local(&mut self, local: &hir::Local) {
- match local.init {
- None => {
- local.pat.each_binding(|_, hir_id, span, _| {
- self.delegate.decl_without_init(hir_id, span);
- })
- }
-
- Some(ref expr) => {
- // Variable declarations with
- // initializers are considered
- // "assigns", which is handled by
- // `walk_pat`:
- self.walk_expr(&expr);
- let init_cmt = Rc::new(return_if_err!(self.mc.cat_expr(&expr)));
- self.walk_irrefutable_pat(init_cmt, &local.pat);
- }
+ if let Some(ref expr) = local.init {
+ // Variable declarations with
+ // initializers are considered
+ // "assigns", which is handled by
+ // `walk_pat`:
+ self.walk_expr(&expr);
+ let init_cmt = Rc::new(return_if_err!(self.mc.cat_expr(&expr)));
+ self.walk_irrefutable_pat(init_cmt, &local.pat);
}
}
with_field.ident,
with_field.ty(self.tcx(), substs)
);
- self.delegate_consume(with_expr.hir_id, with_expr.span, &cmt_field);
+ self.delegate_consume(&cmt_field);
}
}
}
adjustment::Adjust::Pointer(_) => {
// Creating a closure/fn-pointer or unsizing consumes
// the input and stores it into the resulting rvalue.
- self.delegate_consume(expr.hir_id, expr.span, &cmt);
+ self.delegate_consume(&cmt);
}
adjustment::Adjust::Deref(None) => {}
// this is an autoref of `x`.
adjustment::Adjust::Deref(Some(ref deref)) => {
let bk = ty::BorrowKind::from_mutbl(deref.mutbl);
- self.delegate.borrow(expr.hir_id, expr.span, &cmt, deref.region, bk, AutoRef);
+ self.delegate.borrow(&cmt, bk);
}
adjustment::Adjust::Borrow(ref autoref) => {
autoref);
match *autoref {
- adjustment::AutoBorrow::Ref(r, m) => {
- self.delegate.borrow(expr.hir_id,
- expr.span,
- cmt_base,
- r,
- ty::BorrowKind::from_mutbl(m.into()),
- AutoRef);
+ adjustment::AutoBorrow::Ref(_, m) => {
+ self.delegate.borrow(cmt_base, ty::BorrowKind::from_mutbl(m.into()));
}
adjustment::AutoBorrow::RawPtr(m) => {
expr.hir_id,
cmt_base);
- // Converting from a &T to *T (or &mut T to *mut T) is
- // treated as borrowing it for the enclosing temporary
- // scope.
- let r = self.tcx().mk_region(ty::ReScope(
- region::Scope {
- id: expr.hir_id.local_id,
- data: region::ScopeData::Node
- }));
-
- self.delegate.borrow(expr.hir_id,
- expr.span,
- cmt_base,
- r,
- ty::BorrowKind::from_mutbl(m),
- AutoUnsafe);
+
+ self.delegate.borrow(cmt_base, ty::BorrowKind::from_mutbl(m));
}
}
}
- fn arm_move_mode(&mut self, discr_cmt: mc::cmt<'tcx>, arm: &hir::Arm) -> TrackMatchMode {
- let mut mode = Unknown;
- self.determine_pat_move_mode(discr_cmt.clone(), &arm.pat, &mut mode);
- mode
- }
-
- fn walk_arm(&mut self, discr_cmt: mc::cmt<'tcx>, arm: &hir::Arm, mode: MatchMode) {
- self.walk_pat(discr_cmt.clone(), &arm.pat, mode);
+ fn walk_arm(&mut self, discr_cmt: mc::cmt<'tcx>, arm: &hir::Arm) {
+ self.walk_pat(discr_cmt.clone(), &arm.pat);
if let Some(hir::Guard::If(ref e)) = arm.guard {
self.consume_expr(e)
/// Walks a pat that occurs in isolation (i.e., top-level of fn argument or
/// let binding, and *not* a match arm or nested pat.)
fn walk_irrefutable_pat(&mut self, cmt_discr: mc::cmt<'tcx>, pat: &hir::Pat) {
- let mut mode = Unknown;
- self.determine_pat_move_mode(cmt_discr.clone(), pat, &mut mode);
- let mode = mode.match_mode();
- self.walk_pat(cmt_discr, pat, mode);
+ self.walk_pat(cmt_discr, pat);
}
- /// Identifies any bindings within `pat` and accumulates within
- /// `mode` whether the overall pattern/match structure is a move,
- /// copy, or borrow.
- fn determine_pat_move_mode(&mut self,
- cmt_discr: mc::cmt<'tcx>,
- pat: &hir::Pat,
- mode: &mut TrackMatchMode) {
- debug!("determine_pat_move_mode cmt_discr={:?} pat={:?}", cmt_discr, pat);
-
- return_if_err!(self.mc.cat_pattern(cmt_discr, pat, |cmt_pat, pat| {
- if let PatKind::Binding(..) = pat.kind {
- let bm = *self.mc.tables.pat_binding_modes()
- .get(pat.hir_id)
- .expect("missing binding mode");
- match bm {
- ty::BindByReference(..) =>
- mode.lub(BorrowingMatch),
- ty::BindByValue(..) => {
- match copy_or_move(&self.mc, self.param_env, &cmt_pat, PatBindingMove) {
- Copy => mode.lub(CopyingMatch),
- Move(..) => mode.lub(MovingMatch),
- }
- }
- }
- }
- }));
- }
- /// The core driver for walking a pattern; `match_mode` must be
- /// established up front, e.g., via `determine_pat_move_mode` (see
- /// also `walk_irrefutable_pat` for patterns that stand alone).
- fn walk_pat(&mut self, cmt_discr: mc::cmt<'tcx>, pat: &hir::Pat, match_mode: MatchMode) {
+ /// The core driver for walking a pattern
+ fn walk_pat(&mut self, cmt_discr: mc::cmt<'tcx>, pat: &hir::Pat) {
debug!("walk_pat(cmt_discr={:?}, pat={:?})", cmt_discr, pat);
let tcx = self.tcx();
return_if_err!(mc.cat_pattern(cmt_discr.clone(), pat, |cmt_pat, pat| {
if let PatKind::Binding(_, canonical_id, ..) = pat.kind {
debug!(
- "walk_pat: binding cmt_pat={:?} pat={:?} match_mode={:?}",
+ "walk_pat: binding cmt_pat={:?} pat={:?}",
cmt_pat,
pat,
- match_mode,
);
if let Some(&bm) = mc.tables.pat_binding_modes().get(pat.hir_id) {
debug!("walk_pat: pat.hir_id={:?} bm={:?}", pat.hir_id, bm);
// binding being produced.
let def = Res::Local(canonical_id);
if let Ok(ref binding_cmt) = mc.cat_res(pat.hir_id, pat.span, pat_ty, def) {
- delegate.mutate(pat.hir_id, pat.span, binding_cmt, MutateMode::Init);
+ delegate.mutate(binding_cmt);
}
// It is also a borrow or copy/move of the value being matched.
match bm {
ty::BindByReference(m) => {
- if let ty::Ref(r, _, _) = pat_ty.kind {
- let bk = ty::BorrowKind::from_mutbl(m);
- delegate.borrow(pat.hir_id, pat.span, &cmt_pat, r, bk, RefBinding);
- }
+ let bk = ty::BorrowKind::from_mutbl(m);
+ delegate.borrow(&cmt_pat, bk);
}
ty::BindByValue(..) => {
- let mode = copy_or_move(mc, param_env, &cmt_pat, PatBindingMove);
+ let mode = copy_or_move(mc, param_env, &cmt_pat);
debug!("walk_pat binding consuming pat");
- delegate.consume_pat(pat, &cmt_pat, mode);
+ delegate.consume(&cmt_pat, mode);
}
}
} else {
}
}
}));
-
- // Do a second pass over the pattern, calling `matched_pat` on
- // the interior nodes (enum variants and structs), as opposed
- // to the above loop's visit of than the bindings that form
- // the leaves of the pattern tree structure.
- return_if_err!(mc.cat_pattern(cmt_discr, pat, |cmt_pat, pat| {
- let qpath = match pat.kind {
- PatKind::Path(ref qpath) |
- PatKind::TupleStruct(ref qpath, ..) |
- PatKind::Struct(ref qpath, ..) => qpath,
- _ => return
- };
- let res = mc.tables.qpath_res(qpath, pat.hir_id);
- match res {
- Res::Def(DefKind::Ctor(CtorOf::Variant, ..), variant_ctor_did) => {
- let variant_did = mc.tcx.parent(variant_ctor_did).unwrap();
- let downcast_cmt = mc.cat_downcast_if_needed(pat, cmt_pat, variant_did);
-
- debug!("variantctor downcast_cmt={:?} pat={:?}", downcast_cmt, pat);
- delegate.matched_pat(pat, &downcast_cmt, match_mode);
- }
- Res::Def(DefKind::Variant, variant_did) => {
- let downcast_cmt = mc.cat_downcast_if_needed(pat, cmt_pat, variant_did);
-
- debug!("variant downcast_cmt={:?} pat={:?}", downcast_cmt, pat);
- delegate.matched_pat(pat, &downcast_cmt, match_mode);
- }
- Res::Def(DefKind::Struct, _)
- | Res::Def(DefKind::Ctor(..), _)
- | Res::Def(DefKind::Union, _)
- | Res::Def(DefKind::TyAlias, _)
- | Res::Def(DefKind::AssocTy, _)
- | Res::SelfTy(..) => {
- debug!("struct cmt_pat={:?} pat={:?}", cmt_pat, pat);
- delegate.matched_pat(pat, &cmt_pat, match_mode);
- }
- _ => {}
- }
- }));
}
fn walk_captures(&mut self, closure_expr: &hir::Expr, fn_decl_span: Span) {
let closure_def_id = self.tcx().hir().local_def_id(closure_expr.hir_id);
if let Some(upvars) = self.tcx().upvars(closure_def_id) {
- for (&var_id, upvar) in upvars.iter() {
+ for &var_id in upvars.keys() {
let upvar_id = ty::UpvarId {
var_path: ty::UpvarPath { hir_id: var_id },
closure_expr_id: closure_def_id.to_local(),
var_id));
match upvar_capture {
ty::UpvarCapture::ByValue => {
- let mode = copy_or_move(&self.mc,
- self.param_env,
- &cmt_var,
- CaptureMove);
- self.delegate.consume(closure_expr.hir_id, upvar.span, &cmt_var, mode);
+ let mode = copy_or_move(&self.mc, self.param_env, &cmt_var);
+ self.delegate.consume(&cmt_var, mode);
}
ty::UpvarCapture::ByRef(upvar_borrow) => {
- self.delegate.borrow(closure_expr.hir_id,
- fn_decl_span,
- &cmt_var,
- upvar_borrow.region,
- upvar_borrow.kind,
- ClosureCapture(upvar.span));
+ self.delegate.borrow(&cmt_var, upvar_borrow.kind);
}
}
}
mc: &mc::MemCategorizationContext<'a, 'tcx>,
param_env: ty::ParamEnv<'tcx>,
cmt: &mc::cmt_<'tcx>,
- move_reason: MoveReason,
) -> ConsumeMode {
if !mc.type_is_copy_modulo_regions(param_env, cmt.ty, cmt.span) {
- Move(move_reason)
+ Move
} else {
Copy
}
projects / rust.git / commitdiff