Commit 8cb1c63

committed

constify comparison traits on network addresses

1 parent c966ab8 commit 8cb1c63Copy full SHA for 8cb1c63

File tree

2 files changed

+18

-9

lines changed

library/core/src/net
- ip_addr.rs
- socket_addr.rs

2 files changed

+18

-9

lines changed

`‎library/core/src/net/ip_addr.rs`

Lines changed: 12 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ pub enum IpAddr {`
`68`	`68`	`/// assert!("0xcb.0x0.0x71.0x00".parse::<Ipv4Addr>().is_err()); // all octets are in hex`
`69`	`69`	/// ```
`70`	`70`	`#[rustc_diagnostic_item = "Ipv4Addr"]`
`71`		`-#[derive(Copy, Clone, PartialEq, Eq)]`
	`71`	`+#[derive(Copy, Clone)]`
	`72`	`+#[derive_const(PartialEq, Eq)]`
`72`	`73`	`#[stable(feature = "rust1", since = "1.0.0")]`
`73`	`74`	`pub struct Ipv4Addr {`
`74`	`75`	`octets: [u8; 4],`
`@@ -161,7 +162,8 @@ impl Hash for Ipv4Addr {`
`161`	`162`	`/// assert_eq!(localhost.is_loopback(), true);`
`162`	`163`	/// ```
`163`	`164`	`#[rustc_diagnostic_item = "Ipv6Addr"]`
`164`		`-#[derive(Copy, Clone, PartialEq, Eq)]`
	`165`	`+#[derive(Copy, Clone)]`
	`166`	`+#[derive_const(PartialEq, Eq)]`
`165`	`167`	`#[stable(feature = "rust1", since = "1.0.0")]`
`166`	`168`	`pub struct Ipv6Addr {`
`167`	`169`	`octets: [u8; 16],`
`@@ -1183,7 +1185,8 @@ impl PartialEq<IpAddr> for Ipv4Addr {`
`1183`	`1185`	`}`
`1184`	`1186`
`1185`	`1187`	`#[stable(feature = "rust1", since = "1.0.0")]`
`1186`		`-impl PartialOrd for Ipv4Addr {`
	`1188`	`+#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]`
	`1189`	`+impl const PartialOrd for Ipv4Addr {`
`1187`	`1190`	`#[inline]`
`1188`	`1191`	`fn partial_cmp(&self, other: &Ipv4Addr) -> Option<Ordering> {`
`1189`	`1192`	`Some(self.cmp(other))`
`@@ -1213,7 +1216,8 @@ impl PartialOrd<IpAddr> for Ipv4Addr {`
`1213`	`1216`	`}`
`1214`	`1217`
`1215`	`1218`	`#[stable(feature = "rust1", since = "1.0.0")]`
`1216`		`-impl Ord for Ipv4Addr {`
	`1219`	`+#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]`
	`1220`	`+impl const Ord for Ipv4Addr {`
`1217`	`1221`	`#[inline]`
`1218`	`1222`	`fn cmp(&self, other: &Ipv4Addr) -> Ordering {`
`1219`	`1223`	`self.octets.cmp(&other.octets)`
`@@ -2177,7 +2181,8 @@ impl PartialEq<Ipv6Addr> for IpAddr {`
`2177`	`2181`	`}`
`2178`	`2182`
`2179`	`2183`	`#[stable(feature = "rust1", since = "1.0.0")]`
`2180`		`-impl PartialOrd for Ipv6Addr {`
	`2184`	`+#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]`
	`2185`	`+impl const PartialOrd for Ipv6Addr {`
`2181`	`2186`	`#[inline]`
`2182`	`2187`	`fn partial_cmp(&self, other: &Ipv6Addr) -> Option<Ordering> {`
`2183`	`2188`	`Some(self.cmp(other))`
`@@ -2207,7 +2212,8 @@ impl PartialOrd<IpAddr> for Ipv6Addr {`
`2207`	`2212`	`}`
`2208`	`2213`
`2209`	`2214`	`#[stable(feature = "rust1", since = "1.0.0")]`
`2210`		`-impl Ord for Ipv6Addr {`
	`2215`	`+#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]`
	`2216`	`+impl const Ord for Ipv6Addr {`
`2211`	`2217`	`#[inline]`
`2212`	`2218`	`fn cmp(&self, other: &Ipv6Addr) -> Ordering {`
`2213`	`2219`	`self.segments().cmp(&other.segments())`

`‎library/core/src/net/socket_addr.rs`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ use crate::net::{IpAddr, Ipv4Addr, Ipv6Addr};`
`28`	`28`	`/// assert_eq!(socket.port(), 8080);`
`29`	`29`	`/// assert_eq!(socket.is_ipv4(), true);`
`30`	`30`	/// ```
`31`		`-#[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]`
	`31`	`+#[derive(Copy, Clone, Hash)]`
	`32`	`+#[derive_const(PartialEq, Eq, PartialOrd, Ord)]`
`32`	`33`	`#[stable(feature = "rust1", since = "1.0.0")]`
`33`	`34`	`pub enum SocketAddr {`
`34`	`35`	`/// An IPv4 socket address.`
`@@ -76,7 +77,8 @@ pub enum SocketAddr {`
`76`	`77`	`/// assert_eq!(socket.ip(), &Ipv4Addr::new(127, 0, 0, 1));`
`77`	`78`	`/// assert_eq!(socket.port(), 8080);`
`78`	`79`	/// ```
`79`		`-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]`
	`80`	`+#[derive(Copy, Clone, Hash)]`
	`81`	`+#[derive_const(Eq, PartialEq, Ord, PartialOrd)]`
`80`	`82`	`#[stable(feature = "rust1", since = "1.0.0")]`
`81`	`83`	`pub struct SocketAddrV4 {`
`82`	`84`	`ip: Ipv4Addr,`
`@@ -142,7 +144,8 @@ pub struct SocketAddrV4 {`
`142`	`144`	`/// with_scope.set_scope_id(3);`
`143`	`145`	`/// assert_eq!("[2001:db8::1%3]:8080".parse(), Ok(with_scope));`
`144`	`146`	/// ```
`145`		`-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]`
	`147`	`+#[derive(Copy, Clone, Hash)]`
	`148`	`+#[derive_const(Eq, PartialEq, Ord, PartialOrd)]`
`146`	`149`	`#[stable(feature = "rust1", since = "1.0.0")]`
`147`	`150`	`pub struct SocketAddrV6 {`
`148`	`151`	`ip: Ipv6Addr,`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 8cb1c63

File tree

2 files changed

2 files changed

`‎library/core/src/net/ip_addr.rs`

`‎library/core/src/net/socket_addr.rs`

0 commit comments