Skip to content

Ensure that associated async fns have unique fresh param names - #65142

Merged
bors merged 1 commit into
rust-lang:masterfrom
matthewjasper:unshadow-anon-lifetimes
Oct 7, 2019
Merged

Ensure that associated async fns have unique fresh param names#65142
bors merged 1 commit into
rust-lang:masterfrom
matthewjasper:unshadow-anon-lifetimes

Conversation

@matthewjasper

Copy link
Copy Markdown
Contributor

Closes#64630

@matthewjaspermatthewjasper added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 5, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @petrochenkov

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 5, 2019
@jonas-schievinkjonas-schievink added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 5, 2019
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 5, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 1471f0b has been approved by petrochenkov

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 5, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Oct 6, 2019
…es, r=petrochenkov
Ensure that associated `async fn`s have unique fresh param names
Closesrust-lang#64630
@tmandrytmandry mentioned this pull request Oct 6, 2019
bors added a commit that referenced this pull request Oct 6, 2019
Rollup of 5 pull requests
Successful merges:
- #65095 (Sort error codes in librustc_passes)
- #65101 (Upgrade librustc_macros dependencies)
- #65142 (Ensure that associated `async fn`s have unique fresh param names)
- #65155 (Use shorthand initialization in rustdoc)
- #65158 (Remove dead module)
Failed merges:
r? @ghost
@bors
bors merged commit 1471f0b into rust-lang:masterOct 7, 2019
@matthewjasper
matthewjasper deleted the unshadow-anon-lifetimes branch October 7, 2019 06:40
@pnkfelix

Copy link
Copy Markdown
Contributor

T-compiler discussed ; beta-accepted

@pnkfelixpnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 10, 2019
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 22, 2019
bors added a commit that referenced this pull request Oct 24, 2019
[beta] backport rollup
This includes a bunch of PRs:
* Fix redundant semicolon lint interaction with proc macro attributes #64387
* Upgrade async/await to "used" keywords. #64875
* syntax: fix dropping of attribute on first param of non-method assocated fn #64894
* async/await: improve not-send errors #64895
* Silence unreachable code lint from await desugaring #64930
* Always mark rust and rust-call abi's as unwind #65020
* Account for macro invocation in `let mut $pat` diagnostic. #65123
* Ensure that associated `async fn`s have unique fresh param names #65142
* Add troubleshooting section to PGO chapter in rustc book. #65402
* Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux #65302
* Optimize `try_expand_impl_trait_type` #65293
* use precalculated dominators in explain_borrow #65172
* Fix ICE #64964#64989
bors added a commit that referenced this pull request Oct 26, 2019
[beta] backport rollup
This includes a bunch of PRs:
* Fix redundant semicolon lint interaction with proc macro attributes #64387
* Upgrade async/await to "used" keywords. #64875
* syntax: fix dropping of attribute on first param of non-method assocated fn #64894
* async/await: improve not-send errors #64895
* Silence unreachable code lint from await desugaring #64930
* Always mark rust and rust-call abi's as unwind #65020
* Account for macro invocation in `let mut $pat` diagnostic. #65123
* Ensure that associated `async fn`s have unique fresh param names #65142
* Add troubleshooting section to PGO chapter in rustc book. #65402
* Upgrade GCC to 8.3.0, glibc to 1.17.0 and crosstool-ng to 1.24.0 for dist-armv7-linux #65302
* Optimize `try_expand_impl_trait_type` #65293
* use precalculated dominators in explain_borrow #65172
* Fix ICE #64964#64989
* [beta] Revert "Auto merge of #62948 - matklad:failable-file-loading, r=petro… #65273
* save-analysis: Don't ICE when resolving qualified type paths in struct members #65353
* save-analysis: Nest tables when processing impl block definitions #65511
* Avoid ICE when checking `Destination` of `break` inside a closure #65518
* Avoid ICE when adjusting bad self ty #65755
* workaround msys2 bug #65762
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Async struct method, <_'> lifetime shadowing

7 participants

@matthewjasper@rust-highfive@petrochenkov@bors@pnkfelix@jonas-schievink@Mark-Simulacrum