From 1ca95ae5ba9c0b3974b620399297c3d494d73601 Mon Sep 17 00:00:00 2001
From: William Lee <wlee@mochify.com>
Date: Thu, 4 Aug 2016 23:43:56 -0400
Subject: [PATCH] Fix for issue #35336 - updating error message for for E0368
to include a span_label
---
src/librustc_typeck/check/op.rs | 14 +++++++++-----
src/test/compile-fail/issue-5239-1.rs | 1 +
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/librustc_typeck/check/op.rs b/src/librustc_typeck/check/op.rs
index d02f87d0b9c..63487683ec3 100644
--- a/src/librustc_typeck/check/op.rs
+++ b/src/librustc_typeck/check/op.rs
@@ -176,11 +176,15 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
// error types are considered "builtin"
if !lhs_ty.references_error() {
if let IsAssign::Yes = is_assign {
- span_err!(self.tcx.sess, lhs_expr.span, E0368,
- "binary assignment operation `{}=` \
- cannot be applied to type `{}`",
- op.node.as_str(),
- lhs_ty);
+ struct_span_err!(self.tcx.sess, lhs_expr.span, E0368,
+ "binary assignment operation `{}=` \
+ cannot be applied to type `{}`",
+ op.node.as_str(),
+ lhs_ty)
+ .span_label(lhs_expr.span,
+ &format!("cannot use `{}=` on type `{}`",
+ op.node.as_str(), lhs_ty))
+ .emit();
} else {
let mut err = struct_span_err!(self.tcx.sess, lhs_expr.span, E0369,
"binary operation `{}` cannot be applied to type `{}`",
diff --git a/src/test/compile-fail/issue-5239-1.rs b/src/test/compile-fail/issue-5239-1.rs
index 1ebef06008f..06e3c9a207b 100644
--- a/src/test/compile-fail/issue-5239-1.rs
+++ b/src/test/compile-fail/issue-5239-1.rs
@@ -13,4 +13,5 @@
fn main() {
let x = |ref x: isize| -> isize { x += 1; };
//~^ ERROR E0368
+ //~| NOTE cannot use `+=` on type `&isize`
}