Provide span for declaration of captured variables#53164
Merged
bors merged 3 commits intorust-lang:masterfrom Aug 15, 2018
Merged
Provide span for declaration of captured variables#53164bors merged 3 commits intorust-lang:masterfrom
bors merged 3 commits intorust-lang:masterfrom
Conversation
rust-highfive
added
the
S-waiting-on-review
nikomatsakis
requested changes
Aug 7, 2018
| } => | ||
| { | ||
| if !self.mir.upvar_decls.is_empty() && | ||
| original_path.strip_deref_projections() |
Contributor
There was a problem hiding this comment.
hmm, is strip_deref_projections enough?
Try a case like this:
{
let x = (vec![22], vec![44]);
expect_fn(|| drop(x.0));
}does that work?
nikomatsakis
reviewed
Aug 7, 2018
Contributor
There was a problem hiding this comment.
shouldn't we highlight something here?
Member
Author
There was a problem hiding this comment.
Oops, forgot to update the label logic with the same changes that made that branch get used in the first place for complex cases like this one. Fixed now.
davidtwco
force-pushed
the
issue-52663-span-decl-captured-variables
branch
2 times, most recently
from
3de543b to
3f71e12
Compare
nikomatsakis
approved these changes
Aug 7, 2018
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 3f71e12f72a7772c32638c2ecfb49a719ec4dcb4 has been approved by |
bors
added
S-waiting-on-bors
Contributor
|
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 |
davidtwco
force-pushed
the
issue-52663-span-decl-captured-variables
branch
from
3f71e12 to
56232c6
Compare
Member
Author
|
Oops, fixed! |
Member
|
@bors r=nikomatsakis |
Collaborator
|
📌 Commit 56232c6 has been approved by |
cramertj
added a commit
to cramertj/rust
that referenced
this pull request
Aug 8, 2018
…tured-variables, r=nikomatsakis Provide span for declaration of captured variables Part of rust-lang#52663. r? @nikomatsakis
cramertj
added a commit
to cramertj/rust
that referenced
this pull request
Aug 8, 2018
…tured-variables, r=nikomatsakis Provide span for declaration of captured variables Part of rust-lang#52663. r? @nikomatsakis
This was referenced Aug 8, 2018
Collaborator
|
⌛ Testing commit 56232c6 with merge 6671494d4d7bb088db3c37a2a4c3adf84b245029... |
Collaborator
|
💔 Test failed - status-travis |
Contributor
|
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-review
Contributor
|
@bors retry |
bors
removed
the
S-waiting-on-review
Collaborator
|
⌛ Testing commit 56232c6 with merge 89cf35c978c626cd2db98b3bc904a9e55fa35c57... |
Collaborator
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
Contributor
|
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 |
Member
|
bors
added
S-waiting-on-bors
Member
|
@bors r- Merge conflict. |
bors
added
S-waiting-on-author
davidtwco
force-pushed
the
issue-52663-span-decl-captured-variables
branch
from
56232c6 to
5532e9d
Compare
Member
Author
|
Rebased. |
kennytm
added
S-waiting-on-review
nikomatsakis
approved these changes
Aug 15, 2018
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 5532e9d has been approved by |
bors
added
S-waiting-on-bors
Collaborator
bors
added a commit
that referenced
this pull request
Aug 15, 2018
…bles, r=nikomatsakis Provide span for declaration of captured variables Part of #52663. r? @nikomatsakis
Collaborator
|
☀️ Test successful - status-appveyor, status-travis |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Part of #52663.
r? @nikomatsakis