-
Notifications
You must be signed in to change notification settings - Fork 12.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improve suggestion to change struct field to &mut #91516
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -229,15 +229,15 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> { | |||||
} => { | ||||||
err.span_label(span, format!("cannot {ACT}", ACT = act)); | ||||||
|
||||||
if let Some((span, message)) = annotate_struct_field( | ||||||
if let Some(span) = get_mut_span_in_struct_field( | ||||||
self.infcx.tcx, | ||||||
Place::ty_from(local, proj_base, self.body, self.infcx.tcx).ty, | ||||||
field, | ||||||
) { | ||||||
err.span_suggestion( | ||||||
err.span_suggestion_verbose( | ||||||
span, | ||||||
"consider changing this to be mutable", | ||||||
message, | ||||||
"mut ".into(), | ||||||
Applicability::MaybeIncorrect, | ||||||
); | ||||||
} | ||||||
|
@@ -1059,18 +1059,18 @@ fn is_closure_or_generator(ty: Ty<'_>) -> bool { | |||||
ty.is_closure() || ty.is_generator() | ||||||
} | ||||||
|
||||||
/// Adds a suggestion to a struct definition given a field access to a local. | ||||||
/// This function expects the local to be a reference to a struct in order to produce a suggestion. | ||||||
/// Given a field that needs to be mutuable, returns a span where the mut could go. | ||||||
/// This function expects the local to be a reference to a struct in order to produce a span. | ||||||
/// | ||||||
/// ```text | ||||||
/// LL | s: &'a String | ||||||
/// | ---------- use `&'a mut String` here to make mutable | ||||||
/// | ^ returns a span pointing here | ||||||
/// ``` | ||||||
fn annotate_struct_field<'tcx>( | ||||||
fn get_mut_span_in_struct_field<'tcx>( | ||||||
tcx: TyCtxt<'tcx>, | ||||||
ty: Ty<'tcx>, | ||||||
field: &mir::Field, | ||||||
) -> Option<(Span, String)> { | ||||||
) -> Option<Span> { | ||||||
// Expect our local to be a reference to a struct of some kind. | ||||||
if let ty::Ref(_, ty, _) = ty.kind() { | ||||||
if let ty::Adt(def, _) = ty.kind() { | ||||||
|
@@ -1081,25 +1081,12 @@ fn annotate_struct_field<'tcx>( | |||||
// Now we're dealing with the actual struct that we're going to suggest a change to, | ||||||
// we can expect a field that is an immutable reference to a type. | ||||||
if let hir::Node::Field(field) = node { | ||||||
if let hir::TyKind::Rptr( | ||||||
lifetime, | ||||||
hir::MutTy { mutbl: hir::Mutability::Not, ref ty }, | ||||||
) = field.ty.kind | ||||||
if let hir::TyKind::Rptr(lifetime, hir::MutTy { mutbl: hir::Mutability::Not, .. }) = | ||||||
field.ty.kind | ||||||
{ | ||||||
// Get the snippets in two parts - the named lifetime (if there is one) and | ||||||
// type being referenced, that way we can reconstruct the snippet without loss | ||||||
// of detail. | ||||||
let type_snippet = tcx.sess.source_map().span_to_snippet(ty.span).ok()?; | ||||||
let lifetime_snippet = if !lifetime.is_elided() { | ||||||
format!("{} ", tcx.sess.source_map().span_to_snippet(lifetime.span).ok()?) | ||||||
} else { | ||||||
String::new() | ||||||
}; | ||||||
|
||||||
return Some(( | ||||||
field.ty.span, | ||||||
format!("&{}mut {}", lifetime_snippet, &*type_snippet,), | ||||||
)); | ||||||
return Some( | ||||||
lifetime.span.with_hi(lifetime.span.hi() + BytePos(1)).shrink_to_hi(), | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
); | ||||||
} | ||||||
} | ||||||
} | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,25 @@ | ||
error[E0596]: cannot borrow `*self.s` as mutable, as it is behind a `&` reference | ||
--> $DIR/issue-38147-2.rs:7:9 | ||
--> $DIR/issue-38147-2.rs:9:9 | ||
| | ||
LL | s: &'a String | ||
| ---------- help: consider changing this to be mutable: `&'a mut String` | ||
... | ||
LL | self.s.push('x'); | ||
| ^^^^^^^^^^^^^^^^ cannot borrow as mutable | ||
| | ||
help: consider changing this to be mutable | ||
| | ||
LL | s: &'a mut String, | ||
| +++ | ||
|
||
error[E0596]: cannot borrow `*self.longer_name` as mutable, as it is behind a `&` reference | ||
--> $DIR/issue-38147-2.rs:12:9 | ||
| | ||
LL | self.longer_name.push(13); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable | ||
| | ||
help: consider changing this to be mutable | ||
| | ||
LL | longer_name: & 'a mut Vec<u8> | ||
| +++ | ||
|
||
error: aborting due to previous error | ||
error: aborting due to 2 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0596`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.