diff options
| author | Jonathan Turner <jturner@mozilla.com> | 2016-05-16 18:40:50 -0400 |
|---|---|---|
| committer | Jonathan Turner <jturner@mozilla.com> | 2016-05-17 06:46:08 -0400 |
| commit | 175ecfefd50932c0ae8fa328579e26baadd6a110 (patch) | |
| tree | cb01c5880bdb348749ab44b1966b44c95f2d9bac /src/librustc_borrowck | |
| parent | 3e9747af497d826aa863e5d47830d7cfc80d94d2 (diff) | |
| download | rust-175ecfefd50932c0ae8fa328579e26baadd6a110.tar.gz rust-175ecfefd50932c0ae8fa328579e26baadd6a110.zip | |
Improve a few errors and fix #33366
Diffstat (limited to 'src/librustc_borrowck')
| -rw-r--r-- | src/librustc_borrowck/borrowck/check_loans.rs | 2 | ||||
| -rw-r--r-- | src/librustc_borrowck/borrowck/gather_loans/move_error.rs | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/librustc_borrowck/borrowck/check_loans.rs b/src/librustc_borrowck/borrowck/check_loans.rs index fcfab96b9df..36f95f62d06 100644 --- a/src/librustc_borrowck/borrowck/check_loans.rs +++ b/src/librustc_borrowck/borrowck/check_loans.rs @@ -872,7 +872,7 @@ impl<'a, 'tcx> CheckLoanCtxt<'a, 'tcx> { &format!("borrow of `{}` occurs here", self.bccx.loan_path_to_string(loan_path))) .span_label(span, - &format!("assignment to `{}` occurs here", + &format!("assignment to borrowed `{}` occurs here", self.bccx.loan_path_to_string(loan_path))) .emit(); } diff --git a/src/librustc_borrowck/borrowck/gather_loans/move_error.rs b/src/librustc_borrowck/borrowck/gather_loans/move_error.rs index cdc68edbf30..5ebb1ab32b8 100644 --- a/src/librustc_borrowck/borrowck/gather_loans/move_error.rs +++ b/src/librustc_borrowck/borrowck/gather_loans/move_error.rs @@ -126,7 +126,7 @@ fn report_cannot_move_out_of<'a, 'tcx>(bccx: &BorrowckCtxt<'a, 'tcx>, move_from.descriptive_string(bccx.tcx)); err.span_label( move_from.span, - &format!("move occurs here") + &format!("cannot move out of {}", move_from.descriptive_string(bccx.tcx)) ); err } @@ -138,7 +138,7 @@ fn report_cannot_move_out_of<'a, 'tcx>(bccx: &BorrowckCtxt<'a, 'tcx>, "cannot move out of type `{}`, \ a non-copy fixed-size array", b.ty); - err.span_label(move_from.span, &format!("can not move out of here")); + err.span_label(move_from.span, &format!("cannot move out of here")); err } else { span_bug!(move_from.span, "this path should not cause illegal move"); @@ -154,7 +154,7 @@ fn report_cannot_move_out_of<'a, 'tcx>(bccx: &BorrowckCtxt<'a, 'tcx>, "cannot move out of type `{}`, \ which defines the `Drop` trait", b.ty); - err.span_label(move_from.span, &format!("can not move out of here")); + err.span_label(move_from.span, &format!("cannot move out of here")); err }, _ => { @@ -175,16 +175,12 @@ fn note_move_destination(mut err: DiagnosticBuilder, if is_first_note { err.span_label( move_to_span, - &format!("attempting to move value to here")); - err.help( - &format!("to prevent the move, \ - use `ref {0}` or `ref mut {0}` to capture value by \ - reference", + &format!("hint: to prevent move, use `ref {0}` or `ref mut {0}`", pat_name)); err } else { - err.span_note(move_to_span, - &format!("and here (use `ref {0}` or `ref mut {0}`)", + err.span_label(move_to_span, + &format!("...and here (use `ref {0}` or `ref mut {0}`)", pat_name)); err } |