Skip to content

Commit c366397

Browse files
authored
Unrolled build for rust-lang#130743
Rollup merge of rust-lang#130743 - YohDeadfall:net-nonblocking-doc, r=Mark-Simulacrum Clarifications for set_nonblocking methods Closes rust-lang#129903. The issue mentions that `send`, `recv` and other operations are interpreted by some users as methods of `TcpSocket` which led to confusion since it hasn't them. To fix it I added "system" into the documentation as being more precise for two reasons: * it's makes it clear that these names are system operations; * it doesn't point to the location of these methods like `libc` because not every system is POSIX compatible.
2 parents 329e7b4 + e424a8c commit c366397

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

library/std/src/net/tcp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ impl TcpStream {
561561

562562
/// Moves this TCP stream into or out of nonblocking mode.
563563
///
564-
/// This will result in `read`, `write`, `recv` and `send` operations
564+
/// This will result in `read`, `write`, `recv` and `send` system operations
565565
/// becoming nonblocking, i.e., immediately returning from their calls.
566566
/// If the IO operation is successful, `Ok` is returned and no further
567567
/// action is required. If the IO operation could not be completed and needs

library/std/src/net/udp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ impl UdpSocket {
764764

765765
/// Moves this UDP socket into or out of nonblocking mode.
766766
///
767-
/// This will result in `recv`, `recv_from`, `send`, and `send_to`
767+
/// This will result in `recv`, `recv_from`, `send`, and `send_to` system
768768
/// operations becoming nonblocking, i.e., immediately returning from their
769769
/// calls. If the IO operation is successful, `Ok` is returned and no
770770
/// further action is required. If the IO operation could not be completed

0 commit comments

Comments
 (0)