diff options
| author | bors <bors@rust-lang.org> | 2024-09-29 10:44:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-29 10:44:16 +0000 |
| commit | 2da3cb9cab706ff029ee5a40c6dee1c1f188e0bb (patch) | |
| tree | 9ac13c0d2e52ec55770f1a7db96cc974dfaa7888 /library/std/src | |
| parent | 329e7b4d4e12e044a61b25b6c12a87eafcde05c1 (diff) | |
| parent | e9c9307d363cc9c9ee27d32801161988c7439dcc (diff) | |
| download | rust-2da3cb9cab706ff029ee5a40c6dee1c1f188e0bb.tar.gz rust-2da3cb9cab706ff029ee5a40c6dee1c1f188e0bb.zip | |
Auto merge of #131012 - GuillaumeGomez:rollup-e9ovh3a, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #130383 (check if it's rust-lang/rust CI job in `llvm::is_ci_llvm_modified`) - #130416 (resolve #130122: reword 'sort-by' edge-conditions documentation) - #130537 (rustdoc: add doc comment to DocVisitor) - #130743 (Clarifications for set_nonblocking methods) - #131010 (extend comment in global_llvm_features regarding target-cpu=native) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/net/tcp.rs | 2 | ||||
| -rw-r--r-- | library/std/src/net/udp.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/net/tcp.rs b/library/std/src/net/tcp.rs index 06ed4f6a03d..f81a13d4c44 100644 --- a/library/std/src/net/tcp.rs +++ b/library/std/src/net/tcp.rs @@ -561,7 +561,7 @@ impl TcpStream { /// Moves this TCP stream into or out of nonblocking mode. /// - /// This will result in `read`, `write`, `recv` and `send` operations + /// This will result in `read`, `write`, `recv` and `send` system operations /// becoming nonblocking, i.e., immediately returning from their calls. /// If the IO operation is successful, `Ok` is returned and no further /// action is required. If the IO operation could not be completed and needs diff --git a/library/std/src/net/udp.rs b/library/std/src/net/udp.rs index 8c9e31f9c15..b78e52023b3 100644 --- a/library/std/src/net/udp.rs +++ b/library/std/src/net/udp.rs @@ -764,7 +764,7 @@ impl UdpSocket { /// Moves this UDP socket into or out of nonblocking mode. /// - /// This will result in `recv`, `recv_from`, `send`, and `send_to` + /// This will result in `recv`, `recv_from`, `send`, and `send_to` system /// operations becoming nonblocking, i.e., immediately returning from their /// calls. If the IO operation is successful, `Ok` is returned and no /// further action is required. If the IO operation could not be completed |