2229: Fix diagnostic issue when using FakeReads in closures #83521
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
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
@roxelo is there a test case for this diagnostic issue? |
|
Yes, the test case that should pass without feature gate is |
|
I see, ok! |
|
@bors r+ |
|
📌 Commit 4b1cccdc299002815276bc77da23df26f03ee488 has been approved by |
bors
added
S-waiting-on-bors
|
@bors delegate+ |
|
✌️ @roxelo can now approve this pull request |
This comment has been minimized.
This comment has been minimized.
roxelo
force-pushed
the
quick-diagnostic-fix
branch
from
3c71ee8 to
afb3f06
Compare
This comment has been minimized.
This comment has been minimized.
roxelo
force-pushed
the
quick-diagnostic-fix
branch
from
afb3f06 to
2629fe4
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
roxelo
force-pushed
the
quick-diagnostic-fix
branch
2 times, most recently
from
fa23062 to
c3cf93a
Compare
nikomatsakis
requested changes
Mar 30, 2021
This comment has been minimized.
This comment has been minimized.
nikomatsakis
approved these changes
Mar 31, 2021
|
@bors r+ |
|
📌 Commit c2c76a0 has been approved by |
|
⌛ Testing commit c2c76a0 with merge 30a97a5c8eb214c1cbbd95ca7540e6d81cf73bc1... |
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 31, 2021
…=nikomatsakis 2229: Fix diagnostic issue when using FakeReads in closures This PR fixes a diagnostic issue caused by rust-lang#82536. A temporary work around was used in this merged PR which involved feature gating the addition of FakeReads introduced as a result of pattern matching in closures. The fix involves adding an optional closure DefId to ForLet and ForMatchedPlace FakeReadCauses. This DefId will only be added if a closure pattern matches a Place starting with an Upvar. r? `@nikomatsakis`
|
@bors retry (yield) |
|
☔ The latest upstream changes (presumably #83790) made this pull request unmergeable. Please resolve the merge conflicts. |
roxelo
force-pushed
the
quick-diagnostic-fix
branch
from
754b10d to
c29dc12
Compare
|
✌️ @roxelo can now approve this pull request |
|
@bors r=nikomatsakis |
|
📌 Commit c29dc12 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Apr 4, 2021
…=nikomatsakis 2229: Fix diagnostic issue when using FakeReads in closures This PR fixes a diagnostic issue caused by rust-lang#82536. A temporary work around was used in this merged PR which involved feature gating the addition of FakeReads introduced as a result of pattern matching in closures. The fix involves adding an optional closure DefId to ForLet and ForMatchedPlace FakeReadCauses. This DefId will only be added if a closure pattern matches a Place starting with an Upvar. r? `@nikomatsakis`
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Apr 4, 2021
…=nikomatsakis 2229: Fix diagnostic issue when using FakeReads in closures This PR fixes a diagnostic issue caused by rust-lang#82536. A temporary work around was used in this merged PR which involved feature gating the addition of FakeReads introduced as a result of pattern matching in closures. The fix involves adding an optional closure DefId to ForLet and ForMatchedPlace FakeReadCauses. This DefId will only be added if a closure pattern matches a Place starting with an Upvar. r? ``@nikomatsakis``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 4, 2021
Rollup of 8 pull requests Successful merges: - rust-lang#73945 (Add an unstable --json=unused-externs flag to print unused externs) - rust-lang#81619 (Implement `SourceIterator` and `InPlaceIterable` for `ResultShunt`) - rust-lang#82726 (BTree: move blocks around in node.rs) - rust-lang#83521 (2229: Fix diagnostic issue when using FakeReads in closures) - rust-lang#83532 (Fix compiletest on FreeBSD) - rust-lang#83793 (rustdoc: highlight macros more efficiently) - rust-lang#83809 (Remove unneeded INITIAL_IDS const) - rust-lang#83827 (cleanup leak after test to make miri happy) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
pnkfelix
added a commit
to pnkfelix/rust
that referenced
this pull request
May 21, 2021
(and thus exposed underlying issue rust-lang#85561).
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
May 26, 2021
…disjoint-fields-gate, r=nikomatsakis readd capture disjoint fields gate This readds a feature gate guard that was added in PR rust-lang#83521. (Basically, there were unintended consequences to the code exposed by removing the feature gate guard.) The root bug still remains to be resolved, as discussed in issue rust-lang#85561. This is just a band-aid suitable for a beta backport. Cc issue rust-lang#85435 Note that the latter issue is unfixed until we backport this (or another fix) to 1.53 beta
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
May 27, 2021
…disjoint-fields-gate, r=nikomatsakis readd capture disjoint fields gate This readds a feature gate guard that was added in PR rust-lang#83521. (Basically, there were unintended consequences to the code exposed by removing the feature gate guard.) The root bug still remains to be resolved, as discussed in issue rust-lang#85561. This is just a band-aid suitable for a beta backport. Cc issue rust-lang#85435 Note that the latter issue is unfixed until we backport this (or another fix) to 1.53 beta
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
May 27, 2021
…disjoint-fields-gate, r=nikomatsakis readd capture disjoint fields gate This readds a feature gate guard that was added in PR rust-lang#83521. (Basically, there were unintended consequences to the code exposed by removing the feature gate guard.) The root bug still remains to be resolved, as discussed in issue rust-lang#85561. This is just a band-aid suitable for a beta backport. Cc issue rust-lang#85435 Note that the latter issue is unfixed until we backport this (or another fix) to 1.53 beta
pnkfelix
added a commit
to pnkfelix/rust
that referenced
this pull request
Jun 1, 2021
(and thus exposed underlying issue rust-lang#85561).
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.
This PR fixes a diagnostic issue caused by #82536. A temporary work around was used in this merged PR which involved feature gating the addition of FakeReads introduced as a result of pattern matching in closures.
The fix involves adding an optional closure DefId to ForLet and ForMatchedPlace FakeReadCauses. This DefId will only be added if a closure pattern matches a Place starting with an Upvar.
r? @nikomatsakis