From 311a8bef6e879bd0f393154e7a01a41bce385ad9 Mon Sep 17 00:00:00 2001 From: gaurikholkar Date: Mon, 12 Mar 2018 20:14:37 +0530 Subject: [PATCH] address code review comments --- src/librustc_mir/borrow_check/mod.rs | 6 +++--- src/test/ui/nll/issue-47388.rs | 2 +- src/test/ui/nll/issue-47388.stderr | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librustc_mir/borrow_check/mod.rs b/src/librustc_mir/borrow_check/mod.rs index 484b37691ee3..c774a8b9d928 100644 --- a/src/librustc_mir/borrow_check/mod.rs +++ b/src/librustc_mir/borrow_check/mod.rs @@ -1566,7 +1566,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> { if place != place_err { if let Some(name) = self.describe_place(place_err) { - err.note(&format!("Value not mutable causing this error: `{}`", name)); + err.note(&format!("value not mutable causing this error: `{}`", name)); } } @@ -1619,13 +1619,13 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> { err.span_label(span, sec_span); } err.emit() - }else{ + } else { let item_msg_ = self.get_main_error_message(place); let mut err = self.tcx.cannot_assign(span, &item_msg_, Origin::Mir, false); err.span_label(span, "cannot mutate"); if place != place_err { if let Some(name) = self.describe_place(place_err) { - err.note(&format!("Value not mutable causing this error: `{}`", + err.note(&format!("value not mutable causing this error: `{}`", name)); } } diff --git a/src/test/ui/nll/issue-47388.rs b/src/test/ui/nll/issue-47388.rs index a3ce70438cb9..65748eca2a0c 100644 --- a/src/test/ui/nll/issue-47388.rs +++ b/src/test/ui/nll/issue-47388.rs @@ -15,6 +15,6 @@ struct FancyNum { fn main() { let mut fancy = FancyNum{ num: 5 }; let fancy_ref = &(&mut fancy); - fancy_ref.num = 6; + fancy_ref.num = 6; //~^ ERROR E0594 println!("{}", fancy_ref.num); } diff --git a/src/test/ui/nll/issue-47388.stderr b/src/test/ui/nll/issue-47388.stderr index 331836bebbaa..41899e97c9e2 100644 --- a/src/test/ui/nll/issue-47388.stderr +++ b/src/test/ui/nll/issue-47388.stderr @@ -3,7 +3,7 @@ error[E0594]: cannot assign through `&`-reference `fancy_ref` | LL | let fancy_ref = &(&mut fancy); | ------------- help: consider changing this to be a mutable reference: `&mut` -LL | fancy_ref.num = 6; +LL | fancy_ref.num = 6; //~^ ERROR E0594 | ^^^^^^^^^^^^^^^^^ cannot assign through `&`-reference error: aborting due to previous error