Skip to content

Stabilize duration_zero. - #84084

Merged
bors merged 2 commits into
rust-lang:masterfrom
m-ou-se:stabilize-zero
Apr 13, 2021
Merged

Stabilize duration_zero.#84084
bors merged 2 commits into
rust-lang:masterfrom
m-ou-se:stabilize-zero

Conversation

@m-ou-se

Copy link
Copy Markdown
Member

@m-ou-sem-ou-se added the T-libs-api [DEPRECATED; DO NOT USE] label Apr 11, 2021
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @joshtriplett

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2021
@rust-log-analyzer

This comment has been minimized.

@m-ou-se
m-ou-seforce-pushed the stabilize-zero branch 4 times, most recently from 368d7f2 to 347579aCompareApril 11, 2021 10:04
@jonas-schievinkjonas-schievink added the relnotes Marks issues that should be documented in the release notes of the next release. label Apr 11, 2021
@bors

bors commented Apr 12, 2021

Copy link
Copy Markdown
Collaborator

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

@scottmcm

Copy link
Copy Markdown
Member

r? @scottmcm
@bors r+ rollup

@bors

bors commented Apr 12, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 347579a5b8ff1cb6c313baa12ff798bdb265b1c4 has been approved by scottmcm

@borsbors 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 12, 2021
@scottmcm

scottmcm commented Apr 12, 2021

Copy link
Copy Markdown
Member

...and I didn't notice the conflicts 🤦

@bors r-

r=me with the conflicts fixed, though.

@borsbors 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 Apr 12, 2021
@m-ou-se

Copy link
Copy Markdown
MemberAuthor

@bors r=scottmcm

@bors

bors commented Apr 12, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit b44ae96 has been approved by scottmcm

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 12, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 12, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 13, 2021
Rollup of 6 pull requests
Successful merges:
- rust-lang#83438 (Update RELEASES.md)
- rust-lang#83707 (Remove `T: Debug` bound on UnsafeCell Debug impl)
- rust-lang#84084 (Stabilize duration_zero.)
- rust-lang#84121 (Stabilize BTree{Map,Set}::retain)
- rust-lang#84140 (Don't call bump in check_mistyped_turbofish_with_multiple_type_params)
- rust-lang#84141 (Fix typo in error message)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 3d6a364 into rust-lang:masterApr 13, 2021
@rustbotrustbot added this to the 1.53.0 milestone Apr 13, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

relnotesMarks issues that should be documented in the release notes of the next release.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libs-api[DEPRECATED; DO NOT USE]

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@m-ou-se@rust-highfive@rust-log-analyzer@bors@scottmcm@joshtriplett@jonas-schievink@rustbot