Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fc380ec
Adjust `tcp_quickack` feature to allow other `os::linux::net` features.
jmillikin Sep 18, 2022
8f1e6eb
Move `unix_socket_abstract` feature API to `SocketAddrExt`.
jmillikin Sep 18, 2022
12c15a2
Split out from_u32_unchecked from const_char_convert
est31 Sep 29, 2022
176c44c
Stabilize const_char_convert
est31 Sep 29, 2022
f902b49
Don't print full paths in overlap errors
compiler-errors Nov 10, 2022
c2b906b
Recover from fn ptr tys with generic param list
fmease Nov 10, 2022
93921dd
Don't ICE with inline const errors during MIR build
compiler-errors Nov 11, 2022
d8c0fef
Fixed some `_i32` notation in `maybe_uninit`’s doc
Elarcis Nov 12, 2022
442f848
fix some typos in comments
cuishuang Nov 13, 2022
56dfb70
use `EXE_EXTENSION` while searching for python
SparkyPotato Nov 13, 2022
7982d6a
interpret: make check_mplace public
RalfJung Nov 13, 2022
8e81cc2
rustdoc: Resolve doc links in external traits having local impls
petrochenkov Nov 13, 2022
6de5f62
Bump chalk to v0.87
compiler-errors Nov 13, 2022
36a1068
Make rustc build with new chalk
compiler-errors Nov 13, 2022
9f3786b
Rollup merge of #101967 - jmillikin:linux-abstract-socket-addr, r=jos…
matthiaskrgr Nov 14, 2022
8c77da8
Rollup merge of #102470 - est31:stabilize_const_char_convert, r=josht…
matthiaskrgr Nov 14, 2022
a86bdb4
Rollup merge of #104223 - fmease:recover-fn-ptr-with-generics, r=este…
matthiaskrgr Nov 14, 2022
abda584
Rollup merge of #104229 - compiler-errors:overlap-full-path, r=davidtwco
matthiaskrgr Nov 14, 2022
f8e5b1c
Rollup merge of #104294 - compiler-errors:inline-ct-err-in-mir-build,…
matthiaskrgr Nov 14, 2022
43bb507
Rollup merge of #104332 - Elarcis:maybe_uninit_doc_fix, r=m-ou-se
matthiaskrgr Nov 14, 2022
5763fa7
Rollup merge of #104349 - rustaceanclub:master, r=oli-obk
matthiaskrgr Nov 14, 2022
aa29a8b
Rollup merge of #104350 - SparkyPotato:fix-x-wrapper, r=jyn514
matthiaskrgr Nov 14, 2022
050ece6
Rollup merge of #104356 - RalfJung:interpret-check-mplace, r=oli-obk
matthiaskrgr Nov 14, 2022
dc869fc
Rollup merge of #104364 - petrochenkov:docice2, r=GuillaumeGomez
matthiaskrgr Nov 14, 2022
c389097
Rollup merge of #104378 - compiler-errors:chalk-up, r=jackh726
matthiaskrgr Nov 14, 2022
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;