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

Unsupport the `await!(future)` macro #62293

Merged
merged 4 commits into from Jul 31, 2019

Conversation

@Centril
Copy link
Member

commented Jul 2, 2019

Unsupport the await!(future) "macro" and recognize it in error recovery instead.

The future.await syntax has been on nightly since 2019-05-08.
This was 55 days ago which is 1.31 releases ago.

Closes #60610.

r? @cramertj

@cramertj

This comment has been minimized.

Copy link
Member

commented Jul 2, 2019

FYI I'd personally love it if we could hold off on landing this until after I've had a chance to get Fuchsia updated, which has been blocked on #62088 (which should now be addressed once #62287 lands). With out it, I can't do a gradual transition, and it's a great deal of coordination and effort to make the change across multiple repos at once.

That said, if someone's dying to have this land (e.g. if it significantly improves diagnostics or something) then I can deal with it ;)

@Centril

This comment has been minimized.

Copy link
Member Author

commented Jul 2, 2019

@cramertj That's fine by me; I'll split out a PR from this one to switch all testing as much as possible to .await except for the specific tests for await!(..).

EDIT: Tomorrow... 😴 time.

@Centril

This comment has been minimized.

Copy link
Member Author

commented Jul 3, 2019

Lifted out parts of this PR into #62324.

@bors

This comment was marked as resolved.

Copy link
Contributor

commented Jul 3, 2019

☔️ The latest upstream changes (presumably #61775) made this pull request unmergeable. Please resolve the merge conflicts.

@Centril Centril force-pushed the Centril:remove-await-macro branch 2 times, most recently from f2a4015 to cd89106 Jul 3, 2019

@Centril

This comment has been minimized.

Copy link
Member Author

commented Jul 3, 2019

Rebased atop of #62324 (still blocked on things mentioned in #62293 (comment) tho).

@Centril

This comment has been minimized.

Copy link
Member Author

commented Jul 5, 2019

#62287 has landed.

@bors

This comment was marked as resolved.

Copy link
Contributor

commented Jul 5, 2019

☔️ The latest upstream changes (presumably #62099) made this pull request unmergeable. Please resolve the merge conflicts.

@Centril Centril force-pushed the Centril:remove-await-macro branch from cd89106 to 6b14c32 Jul 6, 2019

@Centril

This comment has been minimized.

Copy link
Member Author

commented Jul 6, 2019

Rebased and the tests pass now.

@cramertj How is the update going for Fuchsia?

@cramertj

This comment has been minimized.

Copy link
Member

commented Jul 8, 2019

@Centril Toolstate is currently broken. I'll follow up here when this can land safely.

@bors

This comment was marked as resolved.

Copy link
Contributor

commented Jul 10, 2019

☔️ The latest upstream changes (presumably #62542) made this pull request unmergeable. Please resolve the merge conflicts.

@Centril Centril force-pushed the Centril:remove-await-macro branch 2 times, most recently from 67d5342 to 7ef821c Jul 10, 2019

@bors

This comment was marked as resolved.

Copy link
Contributor

commented Jul 13, 2019

☔️ The latest upstream changes (presumably #62635) made this pull request unmergeable. Please resolve the merge conflicts.

@Centril Centril force-pushed the Centril:remove-await-macro branch from 7ef821c to 8a0dcfb Jul 13, 2019

@bors

This comment was marked as resolved.

Copy link
Contributor

commented Jul 15, 2019

☔️ The latest upstream changes (presumably #62670) made this pull request unmergeable. Please resolve the merge conflicts.

@Centril Centril force-pushed the Centril:remove-await-macro branch from 8a0dcfb to 02bb3a7 Jul 23, 2019

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

commented Jul 23, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-07-23T23:29:57.9765597Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-23T23:29:58.0009568Z ##[command]git config gc.auto 0
2019-07-23T23:29:58.0081795Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-23T23:29:58.0160380Z ##[command]git config --get-all http.proxy
2019-07-23T23:29:58.0310174Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/62293/merge:refs/remotes/pull/62293/merge
---
2019-07-23T23:30:33.7525807Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-23T23:30:33.7526075Z 
2019-07-23T23:30:33.7526519Z   git checkout -b <new-branch-name>
2019-07-23T23:30:33.7526810Z 
2019-07-23T23:30:33.7527047Z HEAD is now at c831287cb Merge 02bb3a790a5989867a96f656590fd7820da10375 into 299ef86e1f8b3e53154f834115752c719b611fa1
2019-07-23T23:30:33.7670810Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-23T23:30:33.7673669Z ==============================================================================
2019-07-23T23:30:33.7673727Z Task         : Bash
2019-07-23T23:30:33.7673772Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-23T23:37:08.2039846Z     Finished release [optimized] target(s) in 1m 32s
2019-07-23T23:37:08.2111115Z tidy check
2019-07-23T23:37:09.1525010Z * 577 error codes
2019-07-23T23:37:09.1525532Z * highest error code: E0732
2019-07-23T23:37:09.1525645Z tidy error: libsyntax/feature_gate.rs:642: feature await_macro is not sorted by since
2019-07-23T23:37:10.0731746Z some tidy checks failed
2019-07-23T23:37:10.0732135Z 
2019-07-23T23:37:10.0732135Z 
2019-07-23T23:37:10.0732984Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-07-23T23:37:10.0733172Z 
2019-07-23T23:37:10.0733196Z 
2019-07-23T23:37:10.0746547Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-07-23T23:37:10.0746630Z Build completed unsuccessfully in 0:01:35
2019-07-23T23:37:10.0746630Z Build completed unsuccessfully in 0:01:35
2019-07-23T23:37:11.5642645Z ##[error]Bash exited with code '1'.
2019-07-23T23:37:11.5694483Z ##[section]Starting: Checkout
2019-07-23T23:37:11.5696852Z ==============================================================================
2019-07-23T23:37:11.5696910Z Task         : Get sources
2019-07-23T23:37:11.5696958Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @TimNN. (Feature Requests)

@bors

This comment was marked as resolved.

Copy link
Contributor

commented Jul 30, 2019

☔️ The latest upstream changes (presumably #63124) made this pull request unmergeable. Please resolve the merge conflicts.

@Centril Centril force-pushed the Centril:remove-await-macro branch from c4141f9 to b21f0a3 Jul 30, 2019

@cramertj

This comment has been minimized.

Copy link
Member

commented Jul 30, 2019

I've successfully rolled the toolchain in fuchsia and we're actively migrating to .await. I think we can land this. Thanks for waiting!

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 30, 2019

📌 Commit b21f0a3 has been approved by cramertj

@bors bors added S-waiting-on-bors and removed S-blocked labels Jul 30, 2019

Centril added a commit to Centril/rust that referenced this pull request Jul 30, 2019

Rollup merge of rust-lang#62293 - Centril:remove-await-macro, r=cramertj
Unsupport the `await!(future)` macro

Unsupport the `await!(future)` "macro" and recognize it in error recovery instead.

The `future.await` syntax has been on nightly since 2019-05-08.
This was 55 days ago which is 1.31 releases ago.

Closes rust-lang#60610.

r? @cramertj

bors added a commit that referenced this pull request Jul 30, 2019

Auto merge of #63148 - Centril:rollup-t813bxw, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #62293 (Unsupport the `await!(future)` macro)
 - #62469 (Add doc links to liballoc crate page)
 - #63095 (Turn `INCOMPLETE_FEATURES` into lint)
 - #63117 (Use global variable 'environ' to pass environments to rtpSpawn)
 - #63123 (`const fn`-ify `std::any::type_name` as laid out in #63084)
 - #63129 (Subslice patterns: Test passing static & dynamic semantics.)
 - #63147 (Updated RELEASES.md for 1.37.0)

Failed merges:

r? @ghost

@bors bors merged commit b21f0a3 into rust-lang:master Jul 31, 2019

4 checks passed

pr Build #20190730.21 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details

@Centril Centril deleted the Centril:remove-await-macro branch Jul 31, 2019

Xanewok added a commit to Xanewok/rustfmt that referenced this pull request Aug 2, 2019

taiki-e added a commit to taiki-e/tokio that referenced this pull request Aug 3, 2019

remove unstable await_macro feature
`await_macro` feature has been removed in rust-lang/rust#62293.

taiki-e added a commit to taiki-e/tokio that referenced this pull request Aug 3, 2019

remove unstable await_macro feature
`await_macro` feature has been removed in rust-lang/rust#62293.
@Xanewok Xanewok referenced this pull request Aug 3, 2019

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Aug 5, 2019

Centril added a commit to Centril/rust that referenced this pull request Aug 5, 2019

Rollup merge of rust-lang#63285 - Mark-Simulacrum:rm-await-origin, r=…
…Centril

Remove leftover AwaitOrigin

This was missed in PR rust-lang#62293.

Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019

Rollup merge of rust-lang#63285 - Mark-Simulacrum:rm-await-origin, r=…
…Centril

Remove leftover AwaitOrigin

This was missed in PR rust-lang#62293.

Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019

Rollup merge of rust-lang#63285 - Mark-Simulacrum:rm-await-origin, r=…
…Centril

Remove leftover AwaitOrigin

This was missed in PR rust-lang#62293.

Centril added a commit to Centril/rust that referenced this pull request Aug 6, 2019

Rollup merge of rust-lang#63285 - Mark-Simulacrum:rm-await-origin, r=…
…Centril

Remove leftover AwaitOrigin

This was missed in PR rust-lang#62293.

taiki-e added a commit to taiki-e/tokio that referenced this pull request Aug 10, 2019

remove unstable await_macro feature
`await_macro` feature has been removed in rust-lang/rust#62293.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.