Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Adjust tcp_quickack feature to allow other os::linux::net features.
  • Loading branch information
jmillikin committed Sep 18, 2022
commit fc380ecd13f0a16519ebf1df64648d006a4985fc
4 changes: 2 additions & 2 deletions library/std/src/os/android/net.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! Linux and Android-specific definitions for socket options.
//! Android-specific networking functionality.

#![unstable(feature = "tcp_quickack", issue = "96256")]
pub use crate::os::net::tcp::TcpStreamExt;
pub use crate::os::net::linux_ext::tcp::TcpStreamExt;
4 changes: 2 additions & 2 deletions library/std/src/os/linux/net.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! Linux and Android-specific definitions for socket options.
//! Linux-specific networking functionality.

#![unstable(feature = "tcp_quickack", issue = "96256")]
pub use crate::os::net::tcp::TcpStreamExt;
pub use crate::os::net::linux_ext::tcp::TcpStreamExt;
9 changes: 9 additions & 0 deletions library/std/src/os/net/linux_ext/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
//! Linux and Android-specific networking functionality.

#![doc(cfg(any(target_os = "linux", target_os = "android")))]

#[unstable(feature = "tcp_quickack", issue = "96256")]
pub(crate) mod tcp;

#[cfg(test)]
mod tests;
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#[cfg(any(target_os = "android", target_os = "linux",))]
#[test]
fn quickack() {
use crate::{
net::{test::next_test_ip4, TcpListener, TcpStream},
os::net::tcp::TcpStreamExt,
os::net::linux_ext::tcp::TcpStreamExt,
};

macro_rules! t {
Expand Down
9 changes: 3 additions & 6 deletions library/std/src/os/net/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
//! Linux and Android-specific definitions for socket options.
//! OS-specific networking functionality.

#![unstable(feature = "tcp_quickack", issue = "96256")]
#![doc(cfg(any(target_os = "linux", target_os = "android",)))]
pub mod tcp;
#[cfg(test)]
mod tests;
#[cfg(any(target_os = "linux", target_os = "android", doc))]
pub(super) mod linux_ext;