diff options
| author | bors <bors@rust-lang.org> | 2025-09-10 21:30:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-10 21:30:05 +0000 |
| commit | f4665ab8368ad2e8a86d4390ae35c28bdd9561bb (patch) | |
| tree | 301e5c15dcb2f6f64faf288a1fe2a1db1eaac790 /library/std/src/net/tcp/tests.rs | |
| parent | 565a9ca63e9df4b223fed0da01f15e578acfb538 (diff) | |
| parent | bb45ea3accf536e0915991c5d9120bab8a87541e (diff) | |
| download | rust-f4665ab8368ad2e8a86d4390ae35c28bdd9561bb.tar.gz rust-f4665ab8368ad2e8a86d4390ae35c28bdd9561bb.zip | |
Auto merge of #146418 - matthiaskrgr:rollup-za0lrux, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang/rust#145327 (std: make address resolution weirdness local to SGX) - rust-lang/rust#145879 (default auto traits: use default supertraits instead of `Self: Trait` bounds on associated items) - rust-lang/rust#146123 (Suggest examples of format specifiers in error messages) - rust-lang/rust#146311 (Minor symbol comment fixes.) - rust-lang/rust#146322 (Make Barrier RefUnwindSafe again) - rust-lang/rust#146327 (Add tests for deref on pin) - rust-lang/rust#146340 (Strip frontmatter in fewer places) - rust-lang/rust#146342 (Improve C-variadic error messages: part 2) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/net/tcp/tests.rs')
| -rw-r--r-- | library/std/src/net/tcp/tests.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/net/tcp/tests.rs b/library/std/src/net/tcp/tests.rs index 03003037b29..7c7ef7b2f70 100644 --- a/library/std/src/net/tcp/tests.rs +++ b/library/std/src/net/tcp/tests.rs @@ -1,5 +1,5 @@ use crate::io::prelude::*; -use crate::io::{BorrowedBuf, IoSlice, IoSliceMut}; +use crate::io::{BorrowedBuf, ErrorKind, IoSlice, IoSliceMut}; use crate::mem::MaybeUninit; use crate::net::test::{next_test_ip4, next_test_ip6}; use crate::net::*; |