Change from label to suggestion.

This commit changes the label to a maybe incorrect suggestion for better
integration with RLS.
This commit is contained in:
David Wood 2018-10-05 14:30:45 +02:00
parent f8c1b0cd5b
commit 9e49ac067f
No known key found for this signature in database
GPG Key ID: 01760B4F9F53F154
3 changed files with 10 additions and 7 deletions

View File

@ -241,7 +241,12 @@ impl<'a, 'gcx, 'tcx> MirBorrowckCtxt<'a, 'gcx, 'tcx> {
base.ty(self.mir, self.infcx.tcx).to_ty(self.infcx.tcx),
field,
) {
err.span_label(span, message);
err.span_suggestion_with_applicability(
span,
"consider changing this to be mutable",
message,
Applicability::MaybeIncorrect,
);
}
},
@ -636,8 +641,6 @@ fn annotate_struct_field(
if let ty::TyKind::Ref(_, ty, _) = ty.sty {
if let ty::TyKind::Adt(def, _) = ty.sty {
let field = def.all_fields().nth(field.index())?;
let span = tcx.def_span(field.did);
// Use the HIR types to construct the diagnostic message.
let node_id = tcx.hir.as_local_node_id(field.did)?;
let node = tcx.hir.find(node_id)?;
@ -659,9 +662,9 @@ fn annotate_struct_field(
};
return Some((
span,
field.ty.span,
format!(
"use `&{}mut {}` here to make mutable",
"&{}mut {}",
lifetime_snippet, &*type_snippet,
),
));

View File

@ -2,7 +2,7 @@ error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` referenc
--> $DIR/issue-38147-2.rs:17:9
|
LL | s: &'a String
| ------------- use `&'a mut String` here to make mutable
| ---------- help: consider changing this to be mutable: `&'a mut String`
...
LL | self.s.push('x');
| ^^^^^^ cannot borrow as mutable

View File

@ -2,7 +2,7 @@ error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` referenc
--> $DIR/issue-38147-3.rs:17:9
|
LL | s: &'a String
| ------------- use `&'a mut String` here to make mutable
| ---------- help: consider changing this to be mutable: `&'a mut String`
...
LL | self.s.push('x');
| ^^^^^^ cannot borrow as mutable