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.

Sign up for GitHub

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

Jump to bottom

Explicitly implement !Send and !Sync for sys::{Args, Env} #84179

Merged
merged 1 commit into from
Apr 24, 2021
Merged

Explicitly implement !Send and !Sync for sys::{Args, Env} #84179

merged 1 commit into from
Apr 24, 2021

Conversation

CDirkx
Copy link
Contributor

@CDirkx CDirkx commented Apr 14, 2021

Remove the field _dont_send_or_sync_me: PhantomData<*mut ()> in favor of an explicit implementation of !Send and !Sync.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(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 14, 2021
m-ou-se
m-ou-se reviewed Apr 14, 2021
View reviewed changes
Copy link
Member

@m-ou-se m-ou-se left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Looks good to me. One typo:

library/std/src/sys/hermit/os.rs Outdated Show resolved Hide resolved
@m-ou-se
Copy link
Member

m-ou-se commented Apr 14, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Apr 14, 2021

📌 Commit b29a887 has been approved by m-ou-se

@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 14, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 14, 2021
@Dylan-DPC
Rollup merge of rust-lang#84179 - CDirkx:dont_send_sync, r=m-ou-se
ea96ac0 
Explicitly implement `!Send` and `!Sync` for `sys::{Args, Env}`

Remove the field `_dont_send_or_sync_me: PhantomData<*mut ()>` in favor of an explicit implementation of `!Send` and `!Sync`.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 14, 2021
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 14, 2021
@Dylan-DPC
Rollup merge of rust-lang#84179 - CDirkx:dont_send_sync, r=m-ou-se
8d4cd5b 
Explicitly implement `!Send` and `!Sync` for `sys::{Args, Env}`

Remove the field `_dont_send_or_sync_me: PhantomData<*mut ()>` in favor of an explicit implementation of `!Send` and `!Sync`.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 14, 2021
Closed
@bors
Copy link
Contributor

bors commented Apr 14, 2021

⌛ Testing commit b29a887 with merge ef45544547ed2665a9d9d072fa90accc1512038b...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Apr 14, 2021

💔 Test failed - checks-actions

@bors bors 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 Apr 14, 2021
@CDirkx
Copy link
Contributor Author

CDirkx commented Apr 15, 2021 •
edited
Loading

Oops another typo, fixed.

@m-ou-se
Copy link
Member

m-ou-se commented Apr 21, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Apr 21, 2021

📌 Commit 2ecc820 has been approved by m-ou-se

@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 21, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 22, 2021
@Dylan-DPC
Rollup merge of rust-lang#84179 - CDirkx:dont_send_sync, r=m-ou-se
16e0773 
Explicitly implement `!Send` and `!Sync` for `sys::{Args, Env}`

Remove the field `_dont_send_or_sync_me: PhantomData<*mut ()>` in favor of an explicit implementation of `!Send` and `!Sync`.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 22, 2021
@Dylan-DPC
Rollup merge of rust-lang#84179 - CDirkx:dont_send_sync, r=m-ou-se
c3eb4b8 
Explicitly implement `!Send` and `!Sync` for `sys::{Args, Env}`

Remove the field `_dont_send_or_sync_me: PhantomData<*mut ()>` in favor of an explicit implementation of `!Send` and `!Sync`.
This was referenced Apr 22, 2021
Closed
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 22, 2021
@Dylan-DPC
Rollup merge of rust-lang#84179 - CDirkx:dont_send_sync, r=m-ou-se
4753698 
Explicitly implement `!Send` and `!Sync` for `sys::{Args, Env}`

Remove the field `_dont_send_or_sync_me: PhantomData<*mut ()>` in favor of an explicit implementation of `!Send` and `!Sync`.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 22, 2021
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 22, 2021
@Dylan-DPC
Rollup merge of rust-lang#84179 - CDirkx:dont_send_sync, r=m-ou-se
cb1e96a 
Explicitly implement `!Send` and `!Sync` for `sys::{Args, Env}`

Remove the field `_dont_send_or_sync_me: PhantomData<*mut ()>` in favor of an explicit implementation of `!Send` and `!Sync`.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 22, 2021
Closed
@bors
Copy link
Contributor

bors commented Apr 22, 2021

☔ The latest upstream changes (presumably #84440) 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 Apr 22, 2021
@CDirkx
Copy link
Contributor Author

CDirkx commented Apr 22, 2021

Rebased and merged.

@CDirkx CDirkx mentioned this pull request Apr 24, 2021
Closed
@m-ou-se
Copy link
Member

m-ou-se commented Apr 24, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Apr 24, 2021

📌 Commit dc110af has been approved by m-ou-se

@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 24, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Apr 24, 2021
@JohnTitor
Rollup merge of rust-lang#84179 - CDirkx:dont_send_sync, r=m-ou-se
759be25 
Explicitly implement `!Send` and `!Sync` for `sys::{Args, Env}`

Remove the field `_dont_send_or_sync_me: PhantomData<*mut ()>` in favor of an explicit implementation of `!Send` and `!Sync`.
This was referenced Apr 24, 2021
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2021
@bors
Auto merge of rust-lang#84525 - JohnTitor:rollup-t2qigt3, r=JohnTitor
7e11f3a 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#83519 (Implement a lint that highlights all moves larger than a configured limit)
 - rust-lang#84105 (stabilize `core::array::{from_ref,from_mut}` in `1.53.0`)
 - rust-lang#84179 (Explicitly implement `!Send` and `!Sync` for `sys::{Args, Env}`)
 - rust-lang#84427 (Update Clippy)
 - rust-lang#84459 (rustdoc: Turn `JsonRenderer::mod_item_in` into `unreachable!()`)
 - rust-lang#84460 (rustdoc: Remove unnecessary `is_crate` field from doctree::Module and clean::Module)
 - rust-lang#84464 (rustdoc: Get rid of `clean::TypeKind`)
 - rust-lang#84518 (Clean up DOM strings)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 78306f0 into rust-lang:master Apr 24, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 24, 2021
@CDirkx CDirkx deleted the dont_send_sync branch April 24, 2021 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@m-ou-se m-ou-se m-ou-se left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.53.0
Development

Successfully merging this pull request may close these issues.
7 participants
@CDirkx @rust-highfive @m-ou-se @bors @rust-log-analyzer @Mark-Simulacrum @rustbot