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
Merged

Conversation

Centril
Copy link
Contributor

@Centril Centril 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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 2, 2019
@cramertj
Copy link
Member

cramertj 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
Copy link
Contributor Author

Centril 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
Copy link
Contributor Author

Centril commented Jul 3, 2019

Lifted out parts of this PR into #62324.

@Centril Centril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 3, 2019
@bors

This comment has been minimized.

@Centril Centril force-pushed the remove-await-macro branch 2 times, most recently from f2a4015 to cd89106 Compare July 3, 2019 22:46
@Centril
Copy link
Contributor Author

Centril commented Jul 3, 2019

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

@Centril
Copy link
Contributor Author

Centril commented Jul 5, 2019

#62287 has landed.

@bors

This comment has been minimized.

@Centril
Copy link
Contributor Author

Centril commented Jul 6, 2019

Rebased and the tests pass now.

@cramertj How is the update going for Fuchsia?

@cramertj
Copy link
Member

cramertj commented Jul 8, 2019

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

@bors

This comment has been minimized.

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

This comment has been minimized.

@bors

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@bors

This comment has been minimized.

@cramertj
Copy link
Member

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
Copy link
Contributor

bors commented Jul 30, 2019

📌 Commit b21f0a3 has been approved by cramertj

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jul 30, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 30, 2019
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
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
@Centril Centril deleted the remove-await-macro branch July 31, 2019 00:38
Xanewok added a commit to Xanewok/rustfmt that referenced this pull request Aug 2, 2019
@Xanewok Xanewok mentioned 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
…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
…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
…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
…Centril

Remove leftover AwaitOrigin

This was missed in PR rust-lang#62293.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Remove await! macro-like syntax support
4 participants