about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-02-05 13:23:56 +0000
committerbors <bors@rust-lang.org>2024-02-05 13:23:56 +0000
commit86eaa892c098f79ff76fd24178caffa1eda86be2 (patch)
treeff35353ce11549191a14d4e7b1cda713edc1a0a3 /library/std/src
parent8c0b4f67c9b4bf477df38c16669fd576d46a2b3d (diff)
parentdc0b1f961a42e5200831cea9f34973320069620f (diff)
Auto merge of #120671 - matthiaskrgr:rollup-spjnpno, r=matthiaskrgr
Rollup of 8 pull requests

Successful merges:

 - #113833 (`std::error::Error` -> Trait Implementations: lifetimes consistency improvement)
 - #115386 (PartialEq, PartialOrd: update and synchronize handling of transitive chains)
 - #116284 (make matching on NaN a hard error, and remove the rest of illegal_floating_point_literal_pattern)
 - #118960 (Add LocalWaker and ContextBuilder types to core, and LocalWake trait to alloc.)
 - #120384 (Use `<T, U>` for array/slice equality `impl`s)
 - #120518 (riscv only supports split_debuginfo=off for now)
 - #120657 (Remove unused struct)
 - #120661 (target: default to the medium code model on LoongArch targets)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
-rw-r--r--library/std/src/sys/pal/sgx/net.rs3
-rw-r--r--library/std/src/sys/pal/teeos/net.rs3
-rw-r--r--library/std/src/sys/pal/xous/net/mod.rs3
3 files changed, 0 insertions, 9 deletions
diff --git a/library/std/src/sys/pal/sgx/net.rs b/library/std/src/sys/pal/sgx/net.rs
index 03620a08f2c..c4d5da1627c 100644
--- a/library/std/src/sys/pal/sgx/net.rs
+++ b/library/std/src/sys/pal/sgx/net.rs
@@ -542,7 +542,4 @@ pub mod netc {
         pub sin6_flowinfo: u32,
         pub sin6_scope_id: u32,
     }
-
-    #[derive(Copy, Clone)]
-    pub struct sockaddr {}
 }
diff --git a/library/std/src/sys/pal/teeos/net.rs b/library/std/src/sys/pal/teeos/net.rs
index 0df681dbfa5..fed95205027 100644
--- a/library/std/src/sys/pal/teeos/net.rs
+++ b/library/std/src/sys/pal/teeos/net.rs
@@ -364,9 +364,6 @@ pub mod netc {
         pub sin6_flowinfo: u32,
         pub sin6_scope_id: u32,
     }
-
-    #[derive(Copy, Clone)]
-    pub struct sockaddr {}
 }
 
 pub type Socket = UdpSocket;
diff --git a/library/std/src/sys/pal/xous/net/mod.rs b/library/std/src/sys/pal/xous/net/mod.rs
index b5a3da136a6..dd8b765aa74 100644
--- a/library/std/src/sys/pal/xous/net/mod.rs
+++ b/library/std/src/sys/pal/xous/net/mod.rs
@@ -78,7 +78,4 @@ pub mod netc {
         pub sin6_flowinfo: u32,
         pub sin6_scope_id: u32,
     }
-
-    #[derive(Copy, Clone)]
-    pub struct sockaddr {}
 }