2018-08-07 01:02:39 -07:00
|
|
|
use core::unicode::property::Pattern_White_Space;
|
2018-09-30 21:21:31 +02:00
|
|
|
use std::fmt::{self, Display};
|
|
|
|
|
2018-06-27 22:06:54 +01:00
|
|
|
use rustc::mir::*;
|
2018-07-13 21:56:04 +01:00
|
|
|
use rustc::ty;
|
2018-09-15 03:18:29 +03:00
|
|
|
use rustc_errors::{DiagnosticBuilder,Applicability};
|
2018-06-27 22:06:54 +01:00
|
|
|
use syntax_pos::Span;
|
|
|
|
|
2018-07-13 21:56:04 +01:00
|
|
|
use borrow_check::MirBorrowckCtxt;
|
2018-08-07 19:50:19 +02:00
|
|
|
use borrow_check::prefixes::PrefixSet;
|
2018-09-30 21:21:31 +02:00
|
|
|
use dataflow::move_paths::{
|
|
|
|
IllegalMoveOrigin, IllegalMoveOriginKind, InitLocation,
|
|
|
|
LookupResult, MoveError, MovePathIndex,
|
|
|
|
};
|
2018-06-27 22:06:54 +01:00
|
|
|
use util::borrowck_errors::{BorrowckErrors, Origin};
|
|
|
|
|
|
|
|
// Often when desugaring a pattern match we may have many individual moves in
|
|
|
|
// MIR that are all part of one operation from the user's point-of-view. For
|
|
|
|
// example:
|
|
|
|
//
|
|
|
|
// let (x, y) = foo()
|
|
|
|
//
|
|
|
|
// would move x from the 0 field of some temporary, and y from the 1 field. We
|
|
|
|
// group such errors together for cleaner error reporting.
|
|
|
|
//
|
|
|
|
// Errors are kept separate if they are from places with different parent move
|
|
|
|
// paths. For example, this generates two errors:
|
|
|
|
//
|
|
|
|
// let (&x, &y) = (&String::new(), &String::new());
|
|
|
|
#[derive(Debug)]
|
|
|
|
enum GroupedMoveError<'tcx> {
|
2018-08-07 01:02:39 -07:00
|
|
|
// Place expression can't be moved from,
|
2018-11-27 02:59:49 +00:00
|
|
|
// e.g., match x[0] { s => (), } where x: &[String]
|
2018-08-07 01:02:39 -07:00
|
|
|
MovesFromPlace {
|
2018-08-07 17:06:21 +02:00
|
|
|
original_path: Place<'tcx>,
|
2018-06-27 22:06:54 +01:00
|
|
|
span: Span,
|
|
|
|
move_from: Place<'tcx>,
|
|
|
|
kind: IllegalMoveOriginKind<'tcx>,
|
|
|
|
binds_to: Vec<Local>,
|
|
|
|
},
|
2018-08-07 01:02:39 -07:00
|
|
|
// Part of a value expression can't be moved from,
|
2018-11-27 02:59:49 +00:00
|
|
|
// e.g., match &String::new() { &x => (), }
|
2018-08-07 01:02:39 -07:00
|
|
|
MovesFromValue {
|
2018-08-07 17:06:21 +02:00
|
|
|
original_path: Place<'tcx>,
|
2018-06-27 22:06:54 +01:00
|
|
|
span: Span,
|
|
|
|
move_from: MovePathIndex,
|
|
|
|
kind: IllegalMoveOriginKind<'tcx>,
|
|
|
|
binds_to: Vec<Local>,
|
|
|
|
},
|
|
|
|
// Everything that isn't from pattern matching.
|
|
|
|
OtherIllegalMove {
|
2018-08-07 17:06:21 +02:00
|
|
|
original_path: Place<'tcx>,
|
2018-06-27 22:06:54 +01:00
|
|
|
span: Span,
|
|
|
|
kind: IllegalMoveOriginKind<'tcx>,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2018-09-30 21:21:31 +02:00
|
|
|
enum BorrowedContentSource {
|
|
|
|
Arc,
|
|
|
|
Rc,
|
2018-10-04 22:40:17 +02:00
|
|
|
DerefRawPointer,
|
2018-09-30 21:21:31 +02:00
|
|
|
Other,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Display for BorrowedContentSource {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
|
|
match *self {
|
|
|
|
BorrowedContentSource::Arc => write!(f, "an `Arc`"),
|
|
|
|
BorrowedContentSource::Rc => write!(f, "an `Rc`"),
|
2018-10-04 22:40:17 +02:00
|
|
|
BorrowedContentSource::DerefRawPointer => write!(f, "dereference of raw pointer"),
|
2018-09-30 21:21:31 +02:00
|
|
|
BorrowedContentSource::Other => write!(f, "borrowed content"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-13 21:56:04 +01:00
|
|
|
impl<'a, 'gcx, 'tcx> MirBorrowckCtxt<'a, 'gcx, 'tcx> {
|
2018-08-07 17:06:21 +02:00
|
|
|
pub(crate) fn report_move_errors(&mut self, move_errors: Vec<(Place<'tcx>, MoveError<'tcx>)>) {
|
2018-06-27 22:06:54 +01:00
|
|
|
let grouped_errors = self.group_move_errors(move_errors);
|
|
|
|
for error in grouped_errors {
|
|
|
|
self.report(error);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-07 17:06:21 +02:00
|
|
|
fn group_move_errors(
|
|
|
|
&self,
|
|
|
|
errors: Vec<(Place<'tcx>, MoveError<'tcx>)>
|
|
|
|
) -> Vec<GroupedMoveError<'tcx>> {
|
2018-06-27 22:06:54 +01:00
|
|
|
let mut grouped_errors = Vec::new();
|
2018-08-07 17:06:21 +02:00
|
|
|
for (original_path, error) in errors {
|
|
|
|
self.append_to_grouped_errors(&mut grouped_errors, original_path, error);
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
|
|
|
grouped_errors
|
|
|
|
}
|
|
|
|
|
|
|
|
fn append_to_grouped_errors(
|
2018-07-13 21:56:04 +01:00
|
|
|
&self,
|
2018-06-27 22:06:54 +01:00
|
|
|
grouped_errors: &mut Vec<GroupedMoveError<'tcx>>,
|
2018-08-07 17:06:21 +02:00
|
|
|
original_path: Place<'tcx>,
|
2018-06-27 22:06:54 +01:00
|
|
|
error: MoveError<'tcx>,
|
|
|
|
) {
|
|
|
|
match error {
|
|
|
|
MoveError::UnionMove { .. } => {
|
|
|
|
unimplemented!("don't know how to report union move errors yet.")
|
|
|
|
}
|
|
|
|
MoveError::IllegalMove {
|
|
|
|
cannot_move_out_of: IllegalMoveOrigin { location, kind },
|
|
|
|
} => {
|
|
|
|
let stmt_source_info = self.mir.source_info(location);
|
2018-07-22 21:38:31 +01:00
|
|
|
// Note: that the only time we assign a place isn't a temporary
|
|
|
|
// to a user variable is when initializing it.
|
|
|
|
// If that ever stops being the case, then the ever initialized
|
|
|
|
// flow could be used.
|
2018-06-27 22:06:54 +01:00
|
|
|
if let Some(StatementKind::Assign(
|
|
|
|
Place::Local(local),
|
2018-09-24 11:32:31 +10:00
|
|
|
box Rvalue::Use(Operand::Move(move_from)),
|
2018-06-27 22:06:54 +01:00
|
|
|
)) = self.mir.basic_blocks()[location.block]
|
|
|
|
.statements
|
|
|
|
.get(location.statement_index)
|
|
|
|
.map(|stmt| &stmt.kind)
|
|
|
|
{
|
|
|
|
let local_decl = &self.mir.local_decls[*local];
|
2018-07-18 21:03:07 +01:00
|
|
|
// opt_match_place is the
|
|
|
|
// match_span is the span of the expression being matched on
|
|
|
|
// match *x.y { ... } match_place is Some(*x.y)
|
|
|
|
// ^^^^ match_span is the span of *x.y
|
|
|
|
//
|
|
|
|
// opt_match_place is None for let [mut] x = ... statements,
|
|
|
|
// whether or not the right-hand side is a place expression
|
2018-06-27 22:06:54 +01:00
|
|
|
if let Some(ClearCrossCrate::Set(BindingForm::Var(VarBindingForm {
|
|
|
|
opt_match_place: Some((ref opt_match_place, match_span)),
|
|
|
|
binding_mode: _,
|
|
|
|
opt_ty_info: _,
|
2018-08-07 01:02:39 -07:00
|
|
|
pat_span: _,
|
2018-06-27 22:06:54 +01:00
|
|
|
}))) = local_decl.is_user_variable
|
|
|
|
{
|
2018-07-22 21:38:31 +01:00
|
|
|
self.append_binding_error(
|
|
|
|
grouped_errors,
|
|
|
|
kind,
|
2018-08-07 17:06:21 +02:00
|
|
|
original_path,
|
2018-07-22 21:38:31 +01:00
|
|
|
move_from,
|
|
|
|
*local,
|
|
|
|
opt_match_place,
|
|
|
|
match_span,
|
|
|
|
stmt_source_info.span,
|
|
|
|
);
|
|
|
|
return;
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
grouped_errors.push(GroupedMoveError::OtherIllegalMove {
|
|
|
|
span: stmt_source_info.span,
|
2018-08-07 17:06:21 +02:00
|
|
|
original_path,
|
2018-06-27 22:06:54 +01:00
|
|
|
kind,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn append_binding_error(
|
2018-07-13 21:56:04 +01:00
|
|
|
&self,
|
2018-06-27 22:06:54 +01:00
|
|
|
grouped_errors: &mut Vec<GroupedMoveError<'tcx>>,
|
|
|
|
kind: IllegalMoveOriginKind<'tcx>,
|
2018-08-07 17:06:21 +02:00
|
|
|
original_path: Place<'tcx>,
|
2018-06-27 22:06:54 +01:00
|
|
|
move_from: &Place<'tcx>,
|
|
|
|
bind_to: Local,
|
|
|
|
match_place: &Option<Place<'tcx>>,
|
|
|
|
match_span: Span,
|
2018-07-22 21:38:31 +01:00
|
|
|
statement_span: Span,
|
2018-06-27 22:06:54 +01:00
|
|
|
) {
|
|
|
|
debug!(
|
2018-08-01 23:53:28 -07:00
|
|
|
"append_binding_error(match_place={:?}, match_span={:?})",
|
2018-06-27 22:06:54 +01:00
|
|
|
match_place, match_span
|
|
|
|
);
|
|
|
|
|
|
|
|
let from_simple_let = match_place.is_none();
|
|
|
|
let match_place = match_place.as_ref().unwrap_or(move_from);
|
|
|
|
|
|
|
|
match self.move_data.rev_lookup.find(match_place) {
|
|
|
|
// Error with the match place
|
|
|
|
LookupResult::Parent(_) => {
|
|
|
|
for ge in &mut *grouped_errors {
|
2018-08-07 01:02:39 -07:00
|
|
|
if let GroupedMoveError::MovesFromPlace { span, binds_to, .. } = ge {
|
2018-06-27 22:06:54 +01:00
|
|
|
if match_span == *span {
|
|
|
|
debug!("appending local({:?}) to list", bind_to);
|
|
|
|
if !binds_to.is_empty() {
|
|
|
|
binds_to.push(bind_to);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
debug!("found a new move error location");
|
|
|
|
|
|
|
|
// Don't need to point to x in let x = ... .
|
2018-07-22 21:38:31 +01:00
|
|
|
let (binds_to, span) = if from_simple_let {
|
|
|
|
(vec![], statement_span)
|
2018-06-27 22:06:54 +01:00
|
|
|
} else {
|
2018-07-22 21:38:31 +01:00
|
|
|
(vec![bind_to], match_span)
|
2018-06-27 22:06:54 +01:00
|
|
|
};
|
2018-08-07 01:02:39 -07:00
|
|
|
grouped_errors.push(GroupedMoveError::MovesFromPlace {
|
2018-07-22 21:38:31 +01:00
|
|
|
span,
|
2018-06-27 22:06:54 +01:00
|
|
|
move_from: match_place.clone(),
|
2018-08-07 17:06:21 +02:00
|
|
|
original_path,
|
2018-06-27 22:06:54 +01:00
|
|
|
kind,
|
|
|
|
binds_to,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
// Error with the pattern
|
|
|
|
LookupResult::Exact(_) => {
|
|
|
|
let mpi = match self.move_data.rev_lookup.find(move_from) {
|
|
|
|
LookupResult::Parent(Some(mpi)) => mpi,
|
|
|
|
// move_from should be a projection from match_place.
|
|
|
|
_ => unreachable!("Probably not unreachable..."),
|
|
|
|
};
|
|
|
|
for ge in &mut *grouped_errors {
|
2018-08-07 01:02:39 -07:00
|
|
|
if let GroupedMoveError::MovesFromValue {
|
2018-06-27 22:06:54 +01:00
|
|
|
span,
|
|
|
|
move_from: other_mpi,
|
|
|
|
binds_to,
|
|
|
|
..
|
|
|
|
} = ge
|
|
|
|
{
|
|
|
|
if match_span == *span && mpi == *other_mpi {
|
|
|
|
debug!("appending local({:?}) to list", bind_to);
|
|
|
|
binds_to.push(bind_to);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
debug!("found a new move error location");
|
2018-08-07 01:02:39 -07:00
|
|
|
grouped_errors.push(GroupedMoveError::MovesFromValue {
|
2018-06-27 22:06:54 +01:00
|
|
|
span: match_span,
|
|
|
|
move_from: mpi,
|
2018-08-07 17:06:21 +02:00
|
|
|
original_path,
|
2018-06-27 22:06:54 +01:00
|
|
|
kind,
|
|
|
|
binds_to: vec![bind_to],
|
|
|
|
});
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-07-18 18:10:08 -03:00
|
|
|
fn report(&mut self, error: GroupedMoveError<'tcx>) {
|
2018-06-27 22:06:54 +01:00
|
|
|
let (mut err, err_span) = {
|
2018-08-07 17:06:21 +02:00
|
|
|
let (span, original_path, kind): (Span, &Place<'tcx>, &IllegalMoveOriginKind) =
|
|
|
|
match error {
|
2018-08-07 01:02:39 -07:00
|
|
|
GroupedMoveError::MovesFromPlace {
|
2018-08-07 17:06:21 +02:00
|
|
|
span,
|
|
|
|
ref original_path,
|
|
|
|
ref kind,
|
|
|
|
..
|
|
|
|
} |
|
2018-08-07 01:02:39 -07:00
|
|
|
GroupedMoveError::MovesFromValue { span, ref original_path, ref kind, .. } |
|
2018-08-07 17:06:21 +02:00
|
|
|
GroupedMoveError::OtherIllegalMove { span, ref original_path, ref kind } => {
|
|
|
|
(span, original_path, kind)
|
|
|
|
},
|
|
|
|
};
|
2018-06-27 22:06:54 +01:00
|
|
|
let origin = Origin::Mir;
|
2018-08-07 17:06:21 +02:00
|
|
|
debug!("report: original_path={:?} span={:?}, kind={:?} \
|
|
|
|
original_path.is_upvar_field_projection={:?}", original_path, span, kind,
|
2018-09-11 16:38:35 +02:00
|
|
|
original_path.is_upvar_field_projection(self.mir, &self.infcx.tcx));
|
2018-06-27 22:06:54 +01:00
|
|
|
(
|
|
|
|
match kind {
|
|
|
|
IllegalMoveOriginKind::Static => {
|
2018-09-11 16:38:35 +02:00
|
|
|
self.infcx.tcx.cannot_move_out_of(span, "static item", origin)
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
2018-07-13 23:39:10 +01:00
|
|
|
IllegalMoveOriginKind::BorrowedContent { target_place: place } => {
|
2018-06-27 22:06:54 +01:00
|
|
|
// Inspect the type of the content behind the
|
|
|
|
// borrow to provide feedback about why this
|
|
|
|
// was a move rather than a copy.
|
2018-09-11 16:38:35 +02:00
|
|
|
let ty = place.ty(self.mir, self.infcx.tcx).to_ty(self.infcx.tcx);
|
2018-08-07 19:50:19 +02:00
|
|
|
let is_upvar_field_projection =
|
|
|
|
self.prefixes(&original_path, PrefixSet::All)
|
2018-09-11 16:38:35 +02:00
|
|
|
.any(|p| p.is_upvar_field_projection(self.mir, &self.infcx.tcx)
|
2018-08-07 19:50:19 +02:00
|
|
|
.is_some());
|
2018-10-04 22:40:17 +02:00
|
|
|
debug!("report: ty={:?}", ty);
|
2018-06-27 22:06:54 +01:00
|
|
|
match ty.sty {
|
2018-09-11 16:38:35 +02:00
|
|
|
ty::Array(..) | ty::Slice(..) =>
|
|
|
|
self.infcx.tcx.cannot_move_out_of_interior_noncopy(
|
|
|
|
span, ty, None, origin
|
|
|
|
),
|
2018-08-22 01:35:02 +01:00
|
|
|
ty::Closure(def_id, closure_substs)
|
2018-08-07 19:50:19 +02:00
|
|
|
if !self.mir.upvar_decls.is_empty() && is_upvar_field_projection
|
2018-08-07 17:06:21 +02:00
|
|
|
=> {
|
2018-07-13 23:39:10 +01:00
|
|
|
let closure_kind_ty =
|
2018-09-11 16:38:35 +02:00
|
|
|
closure_substs.closure_kind_ty(def_id, self.infcx.tcx);
|
2018-07-13 23:39:10 +01:00
|
|
|
let closure_kind = closure_kind_ty.to_opt_closure_kind();
|
|
|
|
let place_description = match closure_kind {
|
|
|
|
Some(ty::ClosureKind::Fn) => {
|
|
|
|
"captured variable in an `Fn` closure"
|
|
|
|
}
|
|
|
|
Some(ty::ClosureKind::FnMut) => {
|
|
|
|
"captured variable in an `FnMut` closure"
|
|
|
|
}
|
|
|
|
Some(ty::ClosureKind::FnOnce) => {
|
|
|
|
bug!("closure kind does not match first argument type")
|
|
|
|
}
|
|
|
|
None => bug!("closure kind not inferred by borrowck"),
|
|
|
|
};
|
2018-08-07 15:37:32 +02:00
|
|
|
debug!("report: closure_kind_ty={:?} closure_kind={:?} \
|
|
|
|
place_description={:?}", closure_kind_ty, closure_kind,
|
|
|
|
place_description);
|
|
|
|
|
2018-09-11 16:38:35 +02:00
|
|
|
let mut diag = self.infcx.tcx.cannot_move_out_of(
|
2018-08-07 17:06:21 +02:00
|
|
|
span, place_description, origin);
|
|
|
|
|
2018-08-07 19:50:19 +02:00
|
|
|
for prefix in self.prefixes(&original_path, PrefixSet::All) {
|
|
|
|
if let Some(field) = prefix.is_upvar_field_projection(
|
2018-09-11 16:38:35 +02:00
|
|
|
self.mir, &self.infcx.tcx) {
|
2018-08-07 19:50:19 +02:00
|
|
|
let upvar_decl = &self.mir.upvar_decls[field.index()];
|
|
|
|
let upvar_hir_id =
|
|
|
|
upvar_decl.var_hir_id.assert_crate_local();
|
|
|
|
let upvar_node_id =
|
2018-12-04 13:45:36 +01:00
|
|
|
self.infcx.tcx.hir().hir_to_node_id(upvar_hir_id);
|
|
|
|
let upvar_span = self.infcx.tcx.hir().span(upvar_node_id);
|
2018-08-07 19:50:19 +02:00
|
|
|
diag.span_label(upvar_span, "captured outer variable");
|
|
|
|
break;
|
|
|
|
}
|
2018-08-07 17:06:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
diag
|
2018-07-13 23:39:10 +01:00
|
|
|
}
|
2018-09-30 21:21:31 +02:00
|
|
|
_ => {
|
|
|
|
let source = self.borrowed_content_source(place);
|
|
|
|
self.infcx.tcx.cannot_move_out_of(
|
2018-10-16 15:10:59 +02:00
|
|
|
span, &source.to_string(), origin
|
2018-09-30 21:21:31 +02:00
|
|
|
)
|
|
|
|
},
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
IllegalMoveOriginKind::InteriorOfTypeWithDestructor { container_ty: ty } => {
|
2018-09-11 16:38:35 +02:00
|
|
|
self.infcx.tcx
|
2018-06-27 22:06:54 +01:00
|
|
|
.cannot_move_out_of_interior_of_drop(span, ty, origin)
|
|
|
|
}
|
2018-09-11 16:38:35 +02:00
|
|
|
IllegalMoveOriginKind::InteriorOfSliceOrArray { ty, is_index } =>
|
|
|
|
self.infcx.tcx.cannot_move_out_of_interior_noncopy(
|
|
|
|
span, ty, Some(*is_index), origin
|
|
|
|
),
|
2018-06-27 22:06:54 +01:00
|
|
|
},
|
|
|
|
span,
|
|
|
|
)
|
|
|
|
};
|
|
|
|
|
|
|
|
self.add_move_hints(error, &mut err, err_span);
|
2018-07-18 18:10:08 -03:00
|
|
|
err.buffer(&mut self.errors_buffer);
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
fn add_move_hints(
|
2018-07-13 21:56:04 +01:00
|
|
|
&self,
|
2018-06-27 22:06:54 +01:00
|
|
|
error: GroupedMoveError<'tcx>,
|
|
|
|
err: &mut DiagnosticBuilder<'a>,
|
|
|
|
span: Span,
|
|
|
|
) {
|
2018-09-11 16:38:35 +02:00
|
|
|
let snippet = self.infcx.tcx.sess.source_map().span_to_snippet(span).unwrap();
|
2018-06-27 22:06:54 +01:00
|
|
|
match error {
|
2018-08-07 01:02:39 -07:00
|
|
|
GroupedMoveError::MovesFromPlace {
|
2018-06-27 22:06:54 +01:00
|
|
|
mut binds_to,
|
|
|
|
move_from,
|
|
|
|
..
|
|
|
|
} => {
|
2018-08-07 23:44:35 -07:00
|
|
|
let try_remove_deref = match move_from {
|
2018-08-07 01:02:39 -07:00
|
|
|
Place::Projection(box PlaceProjection {
|
|
|
|
elem: ProjectionElem::Deref,
|
|
|
|
..
|
2018-08-07 23:44:35 -07:00
|
|
|
}) => true,
|
|
|
|
_ => false,
|
|
|
|
};
|
|
|
|
if try_remove_deref && snippet.starts_with('*') {
|
2018-08-14 12:54:31 -07:00
|
|
|
// The snippet doesn't start with `*` in (e.g.) index
|
|
|
|
// expressions `a[b]`, which roughly desugar to
|
|
|
|
// `*Index::index(&a, b)` or
|
2018-08-07 23:44:35 -07:00
|
|
|
// `*IndexMut::index_mut(&mut a, b)`.
|
2018-09-15 03:18:29 +03:00
|
|
|
err.span_suggestion_with_applicability(
|
2018-08-07 23:44:35 -07:00
|
|
|
span,
|
2018-08-12 13:27:14 -07:00
|
|
|
"consider removing the `*`",
|
2018-08-07 23:44:35 -07:00
|
|
|
snippet[1..].to_owned(),
|
2018-09-15 03:18:29 +03:00
|
|
|
Applicability::Unspecified,
|
2018-08-07 23:44:35 -07:00
|
|
|
);
|
|
|
|
} else {
|
2018-09-15 03:18:29 +03:00
|
|
|
err.span_suggestion_with_applicability(
|
2018-08-07 23:44:35 -07:00
|
|
|
span,
|
2018-08-12 13:55:34 -07:00
|
|
|
"consider borrowing here",
|
2018-08-07 23:44:35 -07:00
|
|
|
format!("&{}", snippet),
|
2018-09-15 03:18:29 +03:00
|
|
|
Applicability::Unspecified,
|
2018-08-07 23:44:35 -07:00
|
|
|
);
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
2018-08-07 23:44:35 -07:00
|
|
|
|
2018-08-07 01:02:39 -07:00
|
|
|
binds_to.sort();
|
|
|
|
binds_to.dedup();
|
2018-08-14 12:54:31 -07:00
|
|
|
self.add_move_error_details(err, &binds_to);
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
2018-08-07 01:02:39 -07:00
|
|
|
GroupedMoveError::MovesFromValue { mut binds_to, .. } => {
|
2018-06-27 22:06:54 +01:00
|
|
|
binds_to.sort();
|
|
|
|
binds_to.dedup();
|
2018-08-07 01:02:39 -07:00
|
|
|
self.add_move_error_suggestions(err, &binds_to);
|
2018-08-14 12:54:31 -07:00
|
|
|
self.add_move_error_details(err, &binds_to);
|
2018-08-07 01:02:39 -07:00
|
|
|
}
|
|
|
|
// No binding. Nothing to suggest.
|
|
|
|
GroupedMoveError::OtherIllegalMove { .. } => (),
|
|
|
|
}
|
|
|
|
}
|
2018-06-27 22:06:54 +01:00
|
|
|
|
2018-08-07 01:02:39 -07:00
|
|
|
fn add_move_error_suggestions(
|
|
|
|
&self,
|
|
|
|
err: &mut DiagnosticBuilder<'a>,
|
|
|
|
binds_to: &[Local],
|
|
|
|
) {
|
2018-08-13 22:01:54 -07:00
|
|
|
let mut suggestions: Vec<(Span, &str, String)> = Vec::new();
|
2018-08-07 01:02:39 -07:00
|
|
|
for local in binds_to {
|
|
|
|
let bind_to = &self.mir.local_decls[*local];
|
|
|
|
if let Some(
|
|
|
|
ClearCrossCrate::Set(BindingForm::Var(VarBindingForm {
|
|
|
|
pat_span,
|
|
|
|
..
|
|
|
|
}))
|
|
|
|
) = bind_to.is_user_variable {
|
2018-09-11 16:38:35 +02:00
|
|
|
let pat_snippet = self.infcx.tcx.sess.source_map()
|
2018-08-07 01:02:39 -07:00
|
|
|
.span_to_snippet(pat_span)
|
|
|
|
.unwrap();
|
|
|
|
if pat_snippet.starts_with('&') {
|
2018-12-05 06:42:56 -08:00
|
|
|
let pat_snippet = pat_snippet[1..].trim_start();
|
2018-08-07 01:02:39 -07:00
|
|
|
let suggestion;
|
2018-08-12 13:27:14 -07:00
|
|
|
let to_remove;
|
2018-08-07 01:02:39 -07:00
|
|
|
if pat_snippet.starts_with("mut")
|
|
|
|
&& pat_snippet["mut".len()..].starts_with(Pattern_White_Space)
|
|
|
|
{
|
2018-12-05 06:42:56 -08:00
|
|
|
suggestion = pat_snippet["mut".len()..].trim_start();
|
2018-08-12 13:27:14 -07:00
|
|
|
to_remove = "&mut";
|
2018-07-31 17:22:12 +02:00
|
|
|
} else {
|
2018-08-07 01:02:39 -07:00
|
|
|
suggestion = pat_snippet;
|
2018-08-12 13:27:14 -07:00
|
|
|
to_remove = "&";
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
2018-08-13 03:17:53 -07:00
|
|
|
suggestions.push((
|
2018-08-07 01:02:39 -07:00
|
|
|
pat_span,
|
2018-08-13 22:01:54 -07:00
|
|
|
to_remove,
|
2018-08-07 01:02:39 -07:00
|
|
|
suggestion.to_owned(),
|
2018-08-13 03:17:53 -07:00
|
|
|
));
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-08-13 03:17:53 -07:00
|
|
|
suggestions.sort_unstable_by_key(|&(span, _, _)| span);
|
|
|
|
suggestions.dedup_by_key(|&mut (span, _, _)| span);
|
2018-08-13 22:01:54 -07:00
|
|
|
for (span, to_remove, suggestion) in suggestions {
|
2018-09-15 03:18:29 +03:00
|
|
|
err.span_suggestion_with_applicability(
|
2018-08-13 22:01:54 -07:00
|
|
|
span,
|
|
|
|
&format!("consider removing the `{}`", to_remove),
|
2018-09-15 03:18:29 +03:00
|
|
|
suggestion,
|
2018-09-17 03:16:08 +03:00
|
|
|
Applicability::MachineApplicable,
|
2018-08-13 22:01:54 -07:00
|
|
|
);
|
2018-08-13 03:17:53 -07:00
|
|
|
}
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
|
|
|
|
2018-08-14 12:54:31 -07:00
|
|
|
fn add_move_error_details(
|
2018-08-07 01:02:39 -07:00
|
|
|
&self,
|
|
|
|
err: &mut DiagnosticBuilder<'a>,
|
|
|
|
binds_to: &[Local],
|
|
|
|
) {
|
2018-08-13 14:51:27 -07:00
|
|
|
let mut noncopy_var_spans = Vec::new();
|
2018-08-07 01:02:39 -07:00
|
|
|
for (j, local) in binds_to.into_iter().enumerate() {
|
|
|
|
let bind_to = &self.mir.local_decls[*local];
|
|
|
|
let binding_span = bind_to.source_info.span;
|
2018-06-27 22:06:54 +01:00
|
|
|
|
2018-08-07 01:02:39 -07:00
|
|
|
if j == 0 {
|
2018-10-16 15:10:59 +02:00
|
|
|
err.span_label(binding_span, "data moved here");
|
2018-08-07 01:02:39 -07:00
|
|
|
} else {
|
2018-10-16 15:10:59 +02:00
|
|
|
err.span_label(binding_span, "...and here");
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
2018-08-07 01:02:39 -07:00
|
|
|
|
2018-08-13 14:51:27 -07:00
|
|
|
if binds_to.len() == 1 {
|
|
|
|
err.span_note(
|
|
|
|
binding_span,
|
|
|
|
&format!(
|
|
|
|
"move occurs because `{}` has type `{}`, \
|
|
|
|
which does not implement the `Copy` trait",
|
|
|
|
bind_to.name.unwrap(),
|
|
|
|
bind_to.ty
|
|
|
|
),
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
noncopy_var_spans.push(binding_span);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if binds_to.len() > 1 {
|
2018-08-07 01:02:39 -07:00
|
|
|
err.span_note(
|
2018-08-13 14:51:27 -07:00
|
|
|
noncopy_var_spans,
|
|
|
|
"move occurs because these variables have types that \
|
|
|
|
don't implement the `Copy` trait",
|
2018-08-07 01:02:39 -07:00
|
|
|
);
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|
|
|
|
}
|
2018-09-30 21:21:31 +02:00
|
|
|
|
|
|
|
fn borrowed_content_source(&self, place: &Place<'tcx>) -> BorrowedContentSource {
|
|
|
|
// Look up the provided place and work out the move path index for it,
|
|
|
|
// we'll use this to work back through where this value came from and check whether it
|
|
|
|
// was originally part of an `Rc` or `Arc`.
|
|
|
|
let initial_mpi = match self.move_data.rev_lookup.find(place) {
|
|
|
|
LookupResult::Exact(mpi) | LookupResult::Parent(Some(mpi)) => mpi,
|
|
|
|
_ => return BorrowedContentSource::Other,
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut queue = vec![initial_mpi];
|
|
|
|
let mut visited = Vec::new();
|
|
|
|
debug!("borrowed_content_source: queue={:?}", queue);
|
|
|
|
while let Some(mpi) = queue.pop() {
|
|
|
|
debug!(
|
|
|
|
"borrowed_content_source: mpi={:?} queue={:?} visited={:?}",
|
|
|
|
mpi, queue, visited
|
|
|
|
);
|
|
|
|
|
|
|
|
// Don't visit the same path twice.
|
|
|
|
if visited.contains(&mpi) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
visited.push(mpi);
|
|
|
|
|
|
|
|
for i in &self.move_data.init_path_map[mpi] {
|
|
|
|
let init = &self.move_data.inits[*i];
|
|
|
|
debug!("borrowed_content_source: init={:?}", init);
|
|
|
|
// We're only interested in statements that initialized a value, not the
|
|
|
|
// initializations from arguments.
|
|
|
|
let loc = match init.location {
|
|
|
|
InitLocation::Statement(stmt) => stmt,
|
|
|
|
_ => continue,
|
|
|
|
};
|
|
|
|
|
|
|
|
let bbd = &self.mir[loc.block];
|
|
|
|
let is_terminator = bbd.statements.len() == loc.statement_index;
|
|
|
|
debug!("borrowed_content_source: loc={:?} is_terminator={:?}", loc, is_terminator);
|
|
|
|
if !is_terminator {
|
|
|
|
let stmt = &bbd.statements[loc.statement_index];
|
|
|
|
debug!("borrowed_content_source: stmt={:?}", stmt);
|
|
|
|
// We're only interested in assignments (in particular, where the
|
|
|
|
// assignment came from - was it an `Rc` or `Arc`?).
|
|
|
|
if let StatementKind::Assign(_, box Rvalue::Ref(_, _, source)) = &stmt.kind {
|
|
|
|
let ty = source.ty(self.mir, self.infcx.tcx).to_ty(self.infcx.tcx);
|
|
|
|
let ty = match ty.sty {
|
|
|
|
ty::TyKind::Ref(_, ty, _) => ty,
|
|
|
|
_ => ty,
|
|
|
|
};
|
|
|
|
debug!("borrowed_content_source: ty={:?}", ty);
|
|
|
|
|
|
|
|
if ty.is_arc() {
|
|
|
|
return BorrowedContentSource::Arc;
|
|
|
|
} else if ty.is_rc() {
|
|
|
|
return BorrowedContentSource::Rc;
|
|
|
|
} else {
|
|
|
|
queue.push(init.path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if let Some(Terminator {
|
|
|
|
kind: TerminatorKind::Call { args, .. },
|
|
|
|
..
|
|
|
|
}) = &bbd.terminator {
|
|
|
|
for arg in args {
|
|
|
|
let source = match arg {
|
|
|
|
Operand::Copy(place) | Operand::Move(place) => place,
|
|
|
|
_ => continue,
|
|
|
|
};
|
|
|
|
|
|
|
|
let ty = source.ty(self.mir, self.infcx.tcx).to_ty(self.infcx.tcx);
|
|
|
|
let ty = match ty.sty {
|
|
|
|
ty::TyKind::Ref(_, ty, _) => ty,
|
|
|
|
_ => ty,
|
|
|
|
};
|
|
|
|
debug!("borrowed_content_source: ty={:?}", ty);
|
|
|
|
|
|
|
|
if ty.is_arc() {
|
|
|
|
return BorrowedContentSource::Arc;
|
|
|
|
} else if ty.is_rc() {
|
|
|
|
return BorrowedContentSource::Rc;
|
|
|
|
} else {
|
|
|
|
queue.push(init.path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-04 22:40:17 +02:00
|
|
|
// If we didn't find an `Arc` or an `Rc`, then check specifically for
|
|
|
|
// a dereference of a place that has the type of a raw pointer.
|
|
|
|
// We can't use `place.ty(..).to_ty(..)` here as that strips away the raw pointer.
|
|
|
|
if let Place::Projection(box Projection {
|
|
|
|
base,
|
|
|
|
elem: ProjectionElem::Deref,
|
|
|
|
}) = place {
|
|
|
|
if base.ty(self.mir, self.infcx.tcx).to_ty(self.infcx.tcx).is_unsafe_ptr() {
|
|
|
|
return BorrowedContentSource::DerefRawPointer;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-30 21:21:31 +02:00
|
|
|
BorrowedContentSource::Other
|
|
|
|
}
|
2018-06-27 22:06:54 +01:00
|
|
|
}
|