Final (one can only hope) futures_api adjustments#59733
Merged
bors merged 2 commits intorust-lang:masterfrom Apr 12, 2019
Merged
Final (one can only hope) futures_api adjustments#59733bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits intorust-lang:masterfrom
Conversation
Centril
previously requested changes
Apr 5, 2019
Merged
Collaborator
|
☔ The latest upstream changes (presumably #59119) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
|
@bors r+ Everything here looks good. |
Collaborator
|
📌 Commit 6786fa7 has been approved by |
RalfJung
reviewed
Apr 11, 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
Collaborator
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
Collaborator
|
☀️ Test successful - checks-travis, status-appveyor |
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`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Based on #59119 -- this change is only the latter two commits.
cc #59725
r? @withoutboats