Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 4 pull requests #63752

Merged
merged 11 commits into from
Aug 20, 2019
Merged

Rollup of 4 pull requests #63752

merged 11 commits into from
Aug 20, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 20, 2019

Successful merges:

Failed merges:

r? @ghost

o01eg and others added 11 commits August 7, 2019 23:37
…amertj

Stabilize `async_await` in Rust 1.39.0

Here we stabilize:
- free and inherent `async fn`s,
- the `<expr>.await` expression form,
- and the `async move? { ... }` block form.

Closes rust-lang#62149.
Closes rust-lang#50547.

All the blockers are now closed.

<details>
- [x] FCP in rust-lang#62149
- [x] rust-lang#61949; PR in rust-lang#62849.
- [x] rust-lang#62517; PR in rust-lang#63376.
- [x] rust-lang#63225; PR in rust-lang#63501
- [x] rust-lang#63388; PR in rust-lang#63499
- [x] rust-lang#63500; PR in rust-lang#63501
- [x] rust-lang#62121 (comment)
    - [x] Some tests for control flow (PR rust-lang#63387):
          - `?`
          - `return` in `async` blocks
          - `break`
    - [x] rust-lang#61775 (comment), i.e. tests for rust-lang#60944 with `async fn`s instead). PR in rust-lang#63383

</details>

r? @cramertj
…coration-from-src/test, r=Centril

Cherry-pick src/test changes with Centril's changes

None
rustc_metadata: replace LazySeq<T> with Lazy<[T]>.

Part of rust-lang#59953, split out for separate landing (see rust-lang#59953 (comment)).

r? @Zoxc
@Centril
Copy link
Contributor Author

Centril commented Aug 20, 2019

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Aug 20, 2019

📌 Commit e3e8b7f has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 20, 2019
@bors
Copy link
Contributor

bors commented Aug 20, 2019

⌛ Testing commit e3e8b7f with merge bea0372...

bors added a commit that referenced this pull request Aug 20, 2019
Rollup of 4 pull requests

Successful merges:

 - #62497 (Fix double resolving custom libdir)
 - #63209 (Stabilize `async_await` in Rust 1.39.0)
 - #63746 (Cherry-pick src/test changes with Centril's changes)
 - #63750 (rustc_metadata: replace LazySeq<T> with Lazy<[T]>.)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 20, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing bea0372 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 20, 2019
@bors bors merged commit e3e8b7f into rust-lang:master Aug 20, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #63752!

Tested on commit bea0372.
Direct link to PR: #63752

💔 clippy-driver on windows: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 20, 2019
Tested on commit rust-lang/rust@bea0372.
Direct link to PR: <rust-lang/rust#63752>

💔 clippy-driver on windows: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).
@Centril Centril deleted the rollup-nlxwety branch August 20, 2019 22:20
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants