Skip to content

Move std::sys::{mutex, condvar, rwlock} to std::sys::locks. - #95173

Merged
bors merged 2 commits into
rust-lang:masterfrom
m-ou-se:sys-locks-module
Mar 23, 2022
Merged

Move std::sys::{mutex, condvar, rwlock} to std::sys::locks.#95173
bors merged 2 commits into
rust-lang:masterfrom
m-ou-se:sys-locks-module

Conversation

@m-ou-se

@m-ou-sem-ou-se commented Mar 21, 2022

Copy link
Copy Markdown
Member

This cleans up the the std::sys modules a bit by putting the locks in a single module called locks rather than spread over the three modules mutex, condvar, and rwlock. This makes it easier to organise lock implementations, which helps with #93740.

@m-ou-sem-ou-se added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Mar 21, 2022
@rust-highfive

rust-highfive commented Mar 21, 2022

Copy link
Copy Markdown
Contributor

r? @dtolnay

(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 Mar 21, 2022
@m-ou-se

m-ou-se commented Mar 21, 2022

Copy link
Copy Markdown
MemberAuthor

Since this touches a lot of platform specific code:

@bors rollup=iffy

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@m-ou-se
m-ou-seforce-pushed the sys-locks-module branch 2 times, most recently from 66b978d to 724fd5aCompareMarch 21, 2022 15:22
@dtolnay

dtolnay commented Mar 21, 2022

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Mar 21, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 724fd5adae37c900812fa7b3a605a7f2fdde0939 has been approved by dtolnay

@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 Mar 21, 2022
@bors

bors commented Mar 22, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 724fd5adae37c900812fa7b3a605a7f2fdde0939 with merge 25793f067828e33f969eca5702d804ea2220aa0a...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Mar 22, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 22, 2022
@dtolnay

dtolnay commented Mar 22, 2022

Copy link
Copy Markdown
Member

@rustbot author

@rustbotrustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 22, 2022
@m-ou-se

m-ou-se commented Mar 22, 2022

Copy link
Copy Markdown
MemberAuthor

@bors r=dtolnay

@bors

bors commented Mar 22, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 8ddb34d has been approved by dtolnay

@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 Mar 22, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 22, 2022
@Dylan-DPC
Rollup merge ofrust-lang#95173- m-ou-se:sys-locks-module, r=dtolnay
9c74640
Move std::sys::{mutex, condvar, rwlock} to std::sys::locks.
This cleans up the the std::sys modules a bit by putting the locks in a single module called `locks` rather than spread over the three modules `mutex`, `condvar`, and `rwlock`. This makes it easier to organise lock implementations, which helps with rust-lang#93740.
@Dylan-DPCDylan-DPC mentioned this pull request Mar 22, 2022
Closed
@bors

bors commented Mar 22, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8ddb34d with merge 2cff93665efc8cdc2e63b40fc01f8a24b2e78fee...

@bors

bors commented Mar 22, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 22, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@dtolnaydtolnay 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 22, 2022
@m-ou-se

m-ou-se commented Mar 22, 2022

Copy link
Copy Markdown
MemberAuthor

Third time's a charm? (:

@bors r=dtolnay

@bors

bors commented Mar 22, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 733153f has been approved by dtolnay

@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 Mar 22, 2022
@Dylan-DPC

Dylan-DPC commented Mar 23, 2022

Copy link
Copy Markdown
Member

@bors rollup=never

@bors

bors commented Mar 23, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 733153f with merge 36748cf...

@bors

bors commented Mar 23, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: dtolnay
Pushing 36748cf to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 23, 2022
@bors
bors merged commit 36748cf into rust-lang:masterMar 23, 2022
@rustbotrustbot added this to the 1.61.0 milestone Mar 23, 2022
This was referenced Mar 23, 2022
Closed
Merged
Closed
Closed
@rust-timer

rust-timer commented Mar 23, 2022

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (36748cf): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@m-ou-se
m-ou-se deleted the sys-locks-module branch March 23, 2022 09:50
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dtolnaydtolnaydtolnay approved these changes

Assignees

@dtolnaydtolnay

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.61.0

Development

Successfully merging this pull request may close these issues.

8 participants

@m-ou-se@rust-highfive@rust-log-analyzer@dtolnay@bors@Dylan-DPC@rust-timer@rustbot