Update closure errors to use span_note

Author: tommyip

src/librustc_borrowck/borrowck/mod.rs

@@ -596,10 +596,11 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
                         if let Some(&(ty::ClosureKind::FnOnce, Some((span, name)))) =
                             self.tables.closure_kinds.get(&node_id)
                         {
-                            err.help(&format!("closure cannot be invoked more than once because \
-                                              it moves the variable `{}` out of its environment",
-                                              name));
-                            err.span_label(span, format!("{} moved here", name));
+                            err.span_note(span, &format!(
+                                "closure cannot be invoked more than once because \
+                                it moves the variable `{}` out of its environment",
+                                name
+                            ));
                             false
                         } else {
                             true

src/test/ui/fn_once-moved.stderr

@@ -1,15 +1,16 @@
 error[E0382]: use of moved value: `debug_dump_dict`
   --> $DIR/fn_once-moved.rs:21:5
    |
-16 |         for (key, value) in dict {
-   |                             ---- dict moved here
-...
 20 |     debug_dump_dict();
    |     --------------- value moved here
 21 |     debug_dump_dict();
    |     ^^^^^^^^^^^^^^^ value used here after move
    |
-   = help: closure cannot be invoked more than once because it moves the variable `dict` out of its environment
+note: closure cannot be invoked more than once because it moves the variable `dict` out of its environment
+  --> $DIR/fn_once-moved.rs:16:29
+   |
+16 |         for (key, value) in dict {
+   |                             ^^^^
 
 error: aborting due to previous error