squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Stabilize IpAddr::is_ipv4 and is_ipv6 as const

Browse source 
Insta-stabilize the methods `is_ipv4` and `is_ipv6` of `IpAddr`.

Possible because of the recent stabilization of const control flow.

Also adds a test for these methods in a const context.
This commit is contained in:
Christiaan Dirkx 2020-09-02 02:05:42 +02:00
parent 4ec27e4b79
commit 3f8fdf83ff
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/std/src/net/ip.rs
View file

@ -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.48.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.48.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(_))
}
}

13
src/test/ui/consts/std/net/ip.rs Normal file
View file

@ -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);
}