Structuring more of the errors

Author: Jonathan Turner

src/librustc_borrowck/borrowck/check_loans.rs

@@ -648,13 +648,17 @@ impl<'a, 'tcx> CheckLoanCtxt<'a, 'tcx> {
                                      copy_path: &LoanPath<'tcx>) {
         match self.analyze_restrictions_on_use(id, copy_path, ty::ImmBorrow) {
             UseOk => { }
-            UseWhileBorrowed(loan_path, loan_span) => {
+            UseWhileBorrowed(_, loan_span) => {
                 struct_span_err!(self.bccx, span, E0503,
                                  "cannot use `{}` because it was mutably borrowed",
                                  &self.bccx.loan_path_to_string(copy_path))
-                    .span_note(loan_span,
-                               &format!("borrow of `{}` occurs here",
-                                       &self.bccx.loan_path_to_string(&loan_path))
+                    .span_label(loan_span,
+                               &format!("mutable borrow of `{}` occurs here",
+                                       &self.bccx.loan_path_to_string(copy_path))
+                               )
+                    .span_label(span,
+                               &format!("use of `{}` occurs here",
+                                       &self.bccx.loan_path_to_string(copy_path))
                                )
                     .emit();
             }
@@ -671,25 +675,38 @@ impl<'a, 'tcx> CheckLoanCtxt<'a, 'tcx> {
         // loans are incompatible with that.
         match self.analyze_restrictions_on_use(id, move_path, ty::MutBorrow) {
             UseOk => { }
-            UseWhileBorrowed(loan_path, loan_span) => {
+            UseWhileBorrowed(_, loan_span) => {
                 let mut err = match move_kind {
-                    move_data::Captured =>
+                    move_data::Captured => {
                         struct_span_err!(self.bccx, span, E0504,
                                          "cannot move `{}` into closure because it is borrowed",
-                                         &self.bccx.loan_path_to_string(move_path)),
+                                         &self.bccx.loan_path_to_string(move_path))
+                        .span_label(
+                                    loan_span,
+                                    &format!("borrow of `{}` occurs here",
+                                    &self.bccx.loan_path_to_string(move_path)))
+                        .span_label(
+                                    span,
+                                    &format!("move of `{}` occurs here",
+                                    &self.bccx.loan_path_to_string(move_path)))
+                    }
                     move_data::Declared |
                     move_data::MoveExpr |
-                    move_data::MovePat =>
+                    move_data::MovePat => {
                         struct_span_err!(self.bccx, span, E0505,
                                          "cannot move out of `{}` because it is borrowed",
                                          &self.bccx.loan_path_to_string(move_path))
+                        .span_label(
+                                    loan_span,
+                                    &format!("borrow of `{}` occurs here",
+                                    &self.bccx.loan_path_to_string(move_path)))
+                        .span_label(
+                                    span,
+                                    &format!("move out of `{}` occurs here",
+                                    &self.bccx.loan_path_to_string(move_path)))
+                    }
                 };
 
-                err.span_note(
-                    loan_span,
-                    &format!("borrow of `{}` occurs here",
-                            &self.bccx.loan_path_to_string(&loan_path))
-                    );
                 err.emit();
             }
         }
@@ -855,9 +872,12 @@ impl<'a, 'tcx> CheckLoanCtxt<'a, 'tcx> {
         struct_span_err!(self.bccx, span, E0506,
                          "cannot assign to `{}` because it is borrowed",
                          self.bccx.loan_path_to_string(loan_path))
-            .span_note(loan.span,
+            .span_label(loan.span,
                        &format!("borrow of `{}` occurs here",
                                self.bccx.loan_path_to_string(loan_path)))
+            .span_label(span,
+                       &format!("assignment to `{}` occurs here",
+                               self.bccx.loan_path_to_string(loan_path)))
             .emit();
     }
 }

src/test/compile-fail/borrowck/borrowck-vec-pattern-nesting.rs

@@ -19,6 +19,7 @@ fn a() {
         [box ref _a, _, _] => {
         //~^ borrow of `vec[..]` occurs here
             vec[0] = box 4; //~ ERROR cannot assign
+            //~^ assignment to `vec[..]` occurs here
         }
     }
 }
@@ -30,6 +31,7 @@ fn b() {
         [_b..] => {
         //~^ borrow of `vec[..]` occurs here
             vec[0] = box 4; //~ ERROR cannot assign
+            //~^ assignment to `vec[..]` occurs here
         }
     }
 }

src/test/compile-fail/issue-25793.rs

@@ -12,6 +12,7 @@ macro_rules! width(
     ($this:expr) => {
         $this.width.unwrap()
         //~^ ERROR cannot use `self.width` because it was mutably borrowed
+        //~| use of `self.width` occurs here
     }
 );
 
@@ -27,7 +28,7 @@ impl HasInfo {
     fn get_other(&mut self) -> usize {
         self.get_size(width!(self))
         //~^ NOTE in this expansion of width!
-        //~| NOTE borrow of `*self` occurs here
+        //~| NOTE mutable borrow of `self.width` occurs here
     }
 }