From fc380ecd13f0a16519ebf1df64648d006a4985fc Mon Sep 17 00:00:00 2001
From: John Millikin <john@john-millikin.com>
Date: Sun, 18 Sep 2022 15:13:42 +0900
Subject: [PATCH] Adjust `tcp_quickack` feature to allow other `os::linux::net`
 features.

---
 library/std/src/os/android/net.rs               | 4 ++--
 library/std/src/os/linux/net.rs                 | 4 ++--
 library/std/src/os/net/linux_ext/mod.rs         | 9 +++++++++
 library/std/src/os/net/{ => linux_ext}/tcp.rs   | 0
 library/std/src/os/net/{ => linux_ext}/tests.rs | 3 +--
 library/std/src/os/net/mod.rs                   | 9 +++------
 6 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 library/std/src/os/net/linux_ext/mod.rs
 rename library/std/src/os/net/{ => linux_ext}/tcp.rs (100%)
 rename library/std/src/os/net/{ => linux_ext}/tests.rs (88%)

diff --git a/library/std/src/os/android/net.rs b/library/std/src/os/android/net.rs
index ff96125c37bdc..53ef7e114c071 100644
--- a/library/std/src/os/android/net.rs
+++ b/library/std/src/os/android/net.rs
@@ -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;
diff --git a/library/std/src/os/linux/net.rs b/library/std/src/os/linux/net.rs
index ff96125c37bdc..d67b369be27b1 100644
--- a/library/std/src/os/linux/net.rs
+++ b/library/std/src/os/linux/net.rs
@@ -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;
diff --git a/library/std/src/os/net/linux_ext/mod.rs b/library/std/src/os/net/linux_ext/mod.rs
new file mode 100644
index 0000000000000..9bd66f3bb80d3
--- /dev/null
+++ b/library/std/src/os/net/linux_ext/mod.rs
@@ -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;
diff --git a/library/std/src/os/net/tcp.rs b/library/std/src/os/net/linux_ext/tcp.rs
similarity index 100%
rename from library/std/src/os/net/tcp.rs
rename to library/std/src/os/net/linux_ext/tcp.rs
diff --git a/library/std/src/os/net/tests.rs b/library/std/src/os/net/linux_ext/tests.rs
similarity index 88%
rename from library/std/src/os/net/tests.rs
rename to library/std/src/os/net/linux_ext/tests.rs
index 4704e3156913c..2db4deed03630 100644
--- a/library/std/src/os/net/tests.rs
+++ b/library/std/src/os/net/linux_ext/tests.rs
@@ -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 {
diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs
index d6d84d24ec489..5ec267c41e97c 100644
--- a/library/std/src/os/net/mod.rs
+++ b/library/std/src/os/net/mod.rs
@@ -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;