about summary refs log tree commit diff
path: root/library/std/src/os/unix/net/tests.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-08-28 07:01:52 +0000
committerbors <bors@rust-lang.org>2023-08-28 07:01:52 +0000
commit7e02fd825198e9a958bac085506890a895498aa0 (patch)
treeca964e93cf01a6027d69bcb536b0d0ffd88d1b8d /library/std/src/os/unix/net/tests.rs
parent41cb42a370b35707a75c79ff9ab6af1191b638fb (diff)
parent32053f760280c6d0ed8b4394947e39e3732702c3 (diff)
downloadrust-7e02fd825198e9a958bac085506890a895498aa0.tar.gz
rust-7e02fd825198e9a958bac085506890a895498aa0.zip
Auto merge of #115303 - matthiaskrgr:rollup-iohs8a5, r=matthiaskrgr
Rollup of 6 pull requests

Successful merges:

 - #109660 (Document that SystemTime does not count leap seconds)
 - #114238 (Fix implementation of `Duration::checked_div`)
 - #114512 (std/tests: disable ancillary tests on freebsd since the feature itsel…)
 - #114919 (style-guide: Add guidance for defining formatting for specific macros)
 - #115278 (tell people what to do when removing an error code)
 - #115280 (avoid triple-backtrace due to panic-during-cleanup)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/os/unix/net/tests.rs')
-rw-r--r--library/std/src/os/unix/net/tests.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/os/unix/net/tests.rs b/library/std/src/os/unix/net/tests.rs
index 3d4302e665c..6a6af9efd78 100644
--- a/library/std/src/os/unix/net/tests.rs
+++ b/library/std/src/os/unix/net/tests.rs
@@ -662,7 +662,7 @@ fn test_send_vectored_fds_unix_stream() {
     }
 }
 
-#[cfg(any(target_os = "android", target_os = "linux", target_os = "freebsd"))]
+#[cfg(any(target_os = "android", target_os = "linux"))]
 #[test]
 #[cfg_attr(target_os = "android", ignore)] // Android SELinux rules prevent creating Unix sockets
 fn test_send_vectored_with_ancillary_to_unix_datagram() {