Fix incorrect span in &mut suggestion
#49931
Merged
+19
−5
Conversation
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
|
r? @eddyb (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @estebank |
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
csmoe
force-pushed
the
end_span
branch
2 times, most recently
from
f962bb6 to
bb2e1b4
Compare
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
estebank
requested changes
Apr 13, 2018
src/librustc_mir/borrow_check/mod.rs
Outdated
| @@ -1654,7 +1662,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> { | |||
|
|
|||
| if let Some((err_help_span, err_help_stmt, item_msg, sec_span)) = err_info { | |||
| let mut err = self.tcx.cannot_assign(span, &item_msg, Origin::Mir); | |||
| err.span_suggestion(err_help_span, err_help_stmt, format!("")); | |||
| err.span_suggestion(err_help_span, &err_help_stmt, format!("")); | |||
There was a problem hiding this comment.
If you look below, the third argument is the code content that will be suggested. Because here an empty String is being passed, the suggestion effectively tells the user to remove the code.
src/librustc_mir/borrow_check/mod.rs
Outdated
| self.tcx.sess.codemap().span_to_snippet(sp) { | ||
| help_stmt = format!( | ||
| "consider changing this to be a \ | ||
| mutable reference: `&mut {}`", &src[1..]); |
There was a problem hiding this comment.
The help message doesn't need to incorporate the suggested code, this is passed as the third argument to span_suggestion and the diagnostic machinery deals with this as appropriate.
src/librustc_mir/borrow_check/mod.rs
Outdated
| help_stmt = format!( | ||
| "consider changing this to be a \ | ||
| mutable reference: `&mut {}`", &src[1..]); | ||
| }; | ||
| err_info = Some(( |
There was a problem hiding this comment.
err_info will need to include the contents of &src[1..] above in order to supply to use it in the suggestion.
src/test/ui/nll/issue-47388.stderr
Outdated
| LL | fancy_ref.num = 6; //~ ERROR E0594 | ||
| | ^^^^^^^^^^^^^^^^^ `fancy_ref` is a `&` reference, so the data it refers to cannot be written | ||
| help: consider changing this to be a mutable reference: `&mut (&mut fancy)` | ||
| | | ||
| LL | let fancy_ref = ; |
There was a problem hiding this comment.
You can see what I'm referring to in the previous comments here: let fancy_ref = ; should be
help: consider changing this to be a mutable reference
|
LL | let fancy_ref = &mut (&mut fancy);
span_suggestion deals with this correctly automatically.
|
Advice addressed. r @estebank |
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@bors r+ rollup |
|
📌 Commit 6f5a16b has been approved by |
bors
added
S-waiting-on-bors
estebank
approved these changes
Apr 14, 2018
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Apr 16, 2018
Fix incorrect span in `&mut` suggestion Fixes rust-lang#49859
bors
added a commit
that referenced
this pull request
Apr 16, 2018
Rollup of 8 pull requests Successful merges: - #49555 (Inline most of the code paths for conversions with boxed slices) - #49606 (Prevent broken pipes causing ICEs) - #49646 (Use box syntax instead of Box::new in Mutex::remutex on Windows) - #49647 (Remove `underscore_lifetimes` and `match_default_bindings` from active feature list) - #49931 (Fix incorrect span in `&mut` suggestion) - #49959 (rustbuild: allow building tools with debuginfo) - #49965 (Remove warning about f64->f32 cast being potential UB) - #49994 (Remove unnecessary indentation in rustdoc book codeblock.) Failed merges:
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #49859