Use smaller span for adjustments on block expressions #53493
Merged
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
nikomatsakis
requested changes
Aug 24, 2018
src/librustc_mir/hair/cx/expr.rs
Outdated
| @@ -96,6 +96,14 @@ fn apply_adjustment<'a, 'gcx, 'tcx>(cx: &mut Cx<'a, 'gcx, 'tcx>, | |||
| ExprKind::Cast { source: expr.to_ref() } | |||
| } | |||
| Adjust::Deref(None) => { | |||
| // Not needed in the next match arm since deref coercions always | |||
| // start with a built-in deref. | |||
There was a problem hiding this comment.
I find this comment sort of confusing. I think you are saying "this adjustment below is not needed in the next arm"? If so, I think it'd be helpful to start with an explanation of what this if is actually doing. (Ideally, including a Rust example)
|
r=me once we improve that comment =) |
nikomatsakis
added
S-waiting-on-author
matthewjasper
force-pushed
the
hair-spans
branch
from
9ce604e
to
9309e2e
Compare
matthewjasper
force-pushed
the
hair-spans
branch
from
2829dd6
to
7f7fada
Compare
|
@bors r+ |
|
📌 Commit 7f7fada has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 7f7fada with merge f97935696d45572f456a8a06bce14b6f791654c6... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
|
The job 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
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Aug 28, 2018
Use smaller span for adjustments on block expressions When returning a mutable reference don't use the entire body of the function as the span for the adjustments at the end. The error [in this case](https://github.com/rust-lang/rust/compare/master...matthewjasper:hair-spans?expand=1#diff-ecef8b1f15622fb48a803c9b61605c78) is worse, but neither error message is really what we want. I have some ideas on how to get a better error message that will have to wait for a future PR.
|
☀️ Test successful - status-appveyor, status-travis |
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.
When returning a mutable reference don't use the entire body of the function as the span for the adjustments at the end.
The error in this case is worse, but neither error message is really what we want. I have some ideas on how to get a better error message that will have to wait for a future PR.