Skip to content

Conversation

cramertj
Copy link
Member

@cramertj cramertj commented Apr 5, 2019

Based on #59119 -- this change is only the latter two commits.
cc #59725

r? @withoutboats

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 5, 2019
Centril
Centril previously requested changes Apr 5, 2019
@cramertj cramertj mentioned this pull request Apr 5, 2019
@bors
Copy link
Collaborator

bors commented Apr 7, 2019

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

@withoutboats
Copy link
Contributor

@bors r+

Everything here looks good.

@bors
Copy link
Collaborator

bors commented Apr 8, 2019

📌 Commit 6786fa7 has been approved by withoutboats

@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-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 8, 2019
cramertj added a commit to cramertj/rust that referenced this pull request Apr 11, 2019
Final (one can only hope) futures_api adjustments

Based on rust-lang#59119 -- this change is only the latter two commits.
cc rust-lang#59725

r? @withoutboats
@bors
Copy link
Collaborator

bors commented Apr 12, 2019

⌛ Testing commit 6786fa7 with merge df25d79...

bors added a commit that referenced this pull request Apr 12, 2019
Final (one can only hope) futures_api adjustments

Based on #59119 -- this change is only the latter two commits.
cc #59725

r? @withoutboats
@bors
Copy link
Collaborator

bors commented Apr 12, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: withoutboats
Pushing df25d79 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 12, 2019
@bors bors merged commit 6786fa7 into rust-lang:master Apr 12, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 23, 2019
Stabilize futures_api

cc rust-lang#59725.
Based on rust-lang#59733 and rust-lang#59119 -- only the last two commits here are relevant.

r? @withoutboats , @oli-obk for the introduction of `rustc_allow_const_fn_ptr`.
Centril added a commit to Centril/rust that referenced this pull request Apr 23, 2019
Stabilize futures_api

cc rust-lang#59725.
Based on rust-lang#59733 and rust-lang#59119 -- only the last two commits here are relevant.

r? @withoutboats , @oli-obk for the introduction of `rustc_allow_const_fn_ptr`.
Centril added a commit to Centril/rust that referenced this pull request Apr 24, 2019
Stabilize futures_api

cc rust-lang#59725.
Based on rust-lang#59733 and rust-lang#59119 -- only the last two commits here are relevant.

r? @withoutboats , @oli-obk for the introduction of `rustc_allow_const_fn_ptr`.
Centril added a commit to Centril/rust that referenced this pull request Apr 24, 2019
Stabilize futures_api

cc rust-lang#59725.
Based on rust-lang#59733 and rust-lang#59119 -- only the last two commits here are relevant.

r? @withoutboats , @oli-obk for the introduction of `rustc_allow_const_fn_ptr`.
@cramertj cramertj deleted the wake-by-ref branch February 19, 2021 22:17
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. 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.

7 participants