diff options
| author | bors <bors@rust-lang.org> | 2020-11-23 04:47:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-23 04:47:25 +0000 |
| commit | 1823a87986c6acf0765c0101d75bca5328416a60 (patch) | |
| tree | b44fb72ecd0d71180f089f3a8637be72f0f98e0b | |
| parent | f32459c7ba767e7f26e3c4c4bd6be326d83bcb78 (diff) | |
| parent | 4613bc96a4dd8b492623aac79d91314041d17af0 (diff) | |
| download | rust-1823a87986c6acf0765c0101d75bca5328416a60.tar.gz rust-1823a87986c6acf0765c0101d75bca5328416a60.zip | |
Auto merge of #76226 - CDirkx:const-ipaddr, r=dtolnay
Stabilize `IpAddr::is_ipv4` and `is_ipv6` as const Insta-stabilize the methods `is_ipv4` and `is_ipv6` of `std::net::IpAddr` as const, in the same way as [PR#76198](https://github.com/rust-lang/rust/pull/76198). Possible because of the recent stabilization of const control flow. Part of #76225 and #76205.
| -rw-r--r-- | library/std/src/net/ip.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/consts/std/net/ip.rs | 13 |
2 files changed, 17 insertions, 2 deletions
diff --git a/library/std/src/net/ip.rs b/library/std/src/net/ip.rs index 04b6f0a5b91..87bbd33bc01 100644 --- a/library/std/src/net/ip.rs +++ b/library/std/src/net/ip.rs @@ -263,8 +263,9 @@ impl IpAddr { /// assert_eq!(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 6)).is_ipv4(), true); /// assert_eq!(IpAddr::V6(Ipv6Addr::new(0x2001, 0xdb8, 0, 0, 0, 0, 0, 0)).is_ipv4(), false); /// ``` + #[rustc_const_stable(feature = "const_ip", since = "1.50.0")] #[stable(feature = "ipaddr_checker", since = "1.16.0")] - pub fn is_ipv4(&self) -> bool { + pub const fn is_ipv4(&self) -> bool { matches!(self, IpAddr::V4(_)) } @@ -281,8 +282,9 @@ impl IpAddr { /// assert_eq!(IpAddr::V4(Ipv4Addr::new(203, 0, 113, 6)).is_ipv6(), false); /// assert_eq!(IpAddr::V6(Ipv6Addr::new(0x2001, 0xdb8, 0, 0, 0, 0, 0, 0)).is_ipv6(), true); /// ``` + #[rustc_const_stable(feature = "const_ip", since = "1.50.0")] #[stable(feature = "ipaddr_checker", since = "1.16.0")] - pub fn is_ipv6(&self) -> bool { + pub const fn is_ipv6(&self) -> bool { matches!(self, IpAddr::V6(_)) } } diff --git a/src/test/ui/consts/std/net/ip.rs b/src/test/ui/consts/std/net/ip.rs new file mode 100644 index 00000000000..6730946577d --- /dev/null +++ b/src/test/ui/consts/std/net/ip.rs @@ -0,0 +1,13 @@ +// run-pass + +use std::net::{IpAddr, Ipv4Addr}; + +fn main() { + const IP_ADDRESS : IpAddr = IpAddr::V4(Ipv4Addr::LOCALHOST); + + const IS_IP_V4 : bool = IP_ADDRESS.is_ipv4(); + assert!(IS_IP_V4); + + const IS_IP_V6 : bool = IP_ADDRESS.is_ipv6(); + assert!(!IS_IP_V6); +} |
