OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add label to primary span for mutable access of immutable struct error

Browse Source
This commit is contained in:
Esteban Küber 2017-03-12 21:28:49 -07:00
parent 38b5b29c57
commit 9ac628d5e8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/librustc_borrowck/borrowck/mod.rs
View File

@ -747,9 +747,9 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
if let Some((span, msg)) = immutable_field { if let Some((span, msg)) = immutable_field {
db.span_label(span, &msg); db.span_label(span, &msg);
} }
if let Some(span) = local_def { if let Some(let_span) = local_def {
if let Ok(snippet) = self.tcx.sess.codemap().span_to_snippet(span) { if let Ok(snippet) = self.tcx.sess.codemap().span_to_snippet(let_span) {
db.span_label(span, &format!("consider changing this to `mut {}`", snippet)); db.span_label(let_span, &format!("consider changing this to `mut {}`", snippet));
} }
} }
db db
@ -1120,6 +1120,11 @@ before rustc 1.16, this temporary lived longer - see issue #39283 \
} else { } else {
db.span_label(*error_span, &format!("cannot borrow mutably")); db.span_label(*error_span, &format!("cannot borrow mutably"));
} }
} else if let Categorization::Interior(ref cmt, _) = err.cmt.cat {
if let mc::MutabilityCategory::McImmutable = cmt.mutbl {
db.span_label(*error_span,
&"cannot mutably borrow immutable field");
}
} }
} }
} }

2
src/test/ui/did_you_mean/issue-39544.stderr
View File

@ -4,7 +4,7 @@ error: cannot borrow immutable field `z.x` as mutable
20 | let z = Z { x: X::Y }; 20 | let z = Z { x: X::Y };
| - consider changing this to `mut z` | - consider changing this to `mut z`
21 | let _ = &mut z.x; 21 | let _ = &mut z.x;
| ^^^ | ^^^ cannot mutably borrow immutable field
error: aborting due to previous error error: aborting due to previous error