Skip to content

Conversation

Mark-Simulacrum
Copy link
Member

Squashed #62653.

@Mark-Simulacrum Mark-Simulacrum self-assigned this Jul 30, 2019
@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jul 30, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=always

@pietroalbini this'll need to be backported to beta (you removed the nominated label on it, but presumably it hasn't yet been backported as it wasn't ready?)

@bors
Copy link
Collaborator

bors commented Jul 30, 2019

📌 Commit c599fcc has been approved by Mark-Simulacrum

@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 Jul 30, 2019
@pietroalbini
Copy link
Member

@pietroalbini this'll need to be backported to beta (you removed the nominated label on it, but presumably it hasn't yet been backported as it wasn't ready?)

Uh, yeah, woops.

@pietroalbini pietroalbini added the T-release Relevant to the release subteam, which will review and decide on the PR/issue. label Jul 30, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 30, 2019
…r=Mark-Simulacrum

Updated RELEASES.md for 1.37.0

Squashed rust-lang#62653.
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 c599fcc into rust-lang:master Jul 31, 2019
@bors
Copy link
Collaborator

bors commented Jul 31, 2019

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 31, 2019
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 4, 2019
bors added a commit that referenced this pull request Aug 5, 2019
[beta] Rollup backports

Cherry picked:

*  Updated RELEASES.md for 1.37.0 #63147
*  Require a value for configure --debuginfo-level #62906
*  Make the parser TokenStream more resilient after mismatched delimiter recovery #62887
*  ci: move .azure-pipelines to src/ci/azure-pipelines #63242

Rolled up:

*  [BETA] Update cargo #62911
*  [beta] Backport #61207 #63254

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants