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

Stabilize duration_zero. #84084

Merged
merged 2 commits into from
Apr 13, 2021
Merged

Stabilize duration_zero. #84084

merged 2 commits into from
Apr 13, 2021

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Apr 11, 2021

FCP here: #73544 (comment)

@m-ou-se m-ou-se added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Apr 11, 2021
@rust-highfive
Copy link
Collaborator

r? @joshtriplett

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

@rust-highfive rust-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-se force-pushed the stabilize-zero branch 4 times, most recently from 368d7f2 to 347579a Compare April 11, 2021 10:04
@jonas-schievink jonas-schievink added the relnotes Marks issues that should be documented in the release notes of the next release. label Apr 11, 2021
@bors
Copy link
Contributor

bors commented Apr 12, 2021

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

@scottmcm
Copy link
Member

r? @scottmcm
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 12, 2021

📌 Commit 347579a5b8ff1cb6c313baa12ff798bdb265b1c4 has been approved by scottmcm

@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 12, 2021
@scottmcm
Copy link
Member

scottmcm commented Apr 12, 2021

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

@bors r-

r=me with the conflicts fixed, though.

@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 Apr 12, 2021
@m-ou-se
Copy link
Member Author

m-ou-se commented Apr 12, 2021

@bors r=scottmcm

@bors
Copy link
Contributor

bors commented Apr 12, 2021

📌 Commit b44ae96 has been approved by scottmcm

@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-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:master Apr 13, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants