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

Few socket updates related for Linux. #2849

Merged
merged 1 commit into from Jul 22, 2022

Conversation

devnexen
Copy link
Contributor

No description provided.

@rust-highfive
Copy link

r? @Amanieu

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

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 21, 2022

📌 Commit cfb7e8b has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 21, 2022

⌛ Testing commit cfb7e8b with merge 1485fb7...

bors added a commit that referenced this pull request Jul 21, 2022
Few socket updates related for Linux.
@bors
Copy link
Contributor

bors commented Jul 21, 2022

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

Seems emscripten doesn't have them.

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 21, 2022

📌 Commit 317b100 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 21, 2022

⌛ Testing commit 317b100 with merge 8036869...

bors added a commit that referenced this pull request Jul 21, 2022
Few socket updates related for Linux.
@bors
Copy link
Contributor

bors commented Jul 21, 2022

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

...Also Android doesn't have MSG_ZEROCOPY, it seems.

@devnexen devnexen force-pushed the socket_linux_update branch 2 times, most recently from f6da550 to 421c0ff Compare July 22, 2022 05:31
@@ -775,6 +775,11 @@ pub const MSG_ERRQUEUE: ::c_int = 0x2000;
pub const MSG_NOSIGNAL: ::c_int = 0x4000;
pub const MSG_MORE: ::c_int = 0x8000;
pub const MSG_WAITFORONE: ::c_int = 0x10000;
cfg_if! {
if #[cfg(not(all(target_os = "emscripten", target_os = "android")))] {
Copy link
Member

Choose a reason for hiding this comment

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

Could you just move them to src/unix/linux_like/linux/mod.rs to avoid cfg complexity?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah you re right

@JohnTitor
Copy link
Member

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Jul 22, 2022

📌 Commit 2b05c86 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 22, 2022

⌛ Testing commit 2b05c86 with merge 5e001f5...

@bors
Copy link
Contributor

bors commented Jul 22, 2022

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 5e001f5 to master...

@bors bors merged commit 5e001f5 into rust-lang:master Jul 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants