Rename is_unicast_global etc. to has_unicast_global_scope

Author: CDirkx

library/std/src/net/ip.rs

@@ -1240,7 +1240,8 @@ impl Ipv6Addr {
         match self.multicast_scope() {
             Some(Ipv6MulticastScope::Global) => true,
             None => {
-                self.is_unicast_global() && !(self.is_unique_local() || self.is_documentation())
+                self.has_unicast_global_scope()
+                    && !(self.is_unique_local() || self.is_documentation())
             }
             _ => false,
         }
@@ -1331,20 +1332,20 @@ impl Ipv6Addr {
     /// use std::net::Ipv6Addr;
     ///
     /// // The loopback address (`::1`) does not actually have link-local scope.
-    /// assert_eq!(Ipv6Addr::LOCALHOST.is_unicast_link_local(), false);
+    /// assert_eq!(Ipv6Addr::LOCALHOST.has_unicast_link_local_scope(), false);
     ///
     /// // Only addresses in `fe80::/10` have link-local scope.
-    /// assert_eq!(Ipv6Addr::new(0x2001, 0xdb8, 0, 0, 0, 0, 0, 0).is_unicast_link_local(), false);
-    /// assert_eq!(Ipv6Addr::new(0xfe80, 0, 0, 0, 0, 0, 0, 0).is_unicast_link_local(), true);
+    /// assert_eq!(Ipv6Addr::new(0x2001, 0xdb8, 0, 0, 0, 0, 0, 0).has_unicast_link_local_scope(), false);
+    /// assert_eq!(Ipv6Addr::new(0xfe80, 0, 0, 0, 0, 0, 0, 0).has_unicast_link_local_scope(), true);
     ///
     /// // Addresses outside the stricter `fe80::/64` also have link-local scope.
-    /// assert_eq!(Ipv6Addr::new(0xfe80, 0, 0, 1, 0, 0, 0, 0).is_unicast_link_local(), true);
-    /// assert_eq!(Ipv6Addr::new(0xfe81, 0, 0, 0, 0, 0, 0, 0).is_unicast_link_local(), true);
+    /// assert_eq!(Ipv6Addr::new(0xfe80, 0, 0, 1, 0, 0, 0, 0).has_unicast_link_local_scope(), true);
+    /// assert_eq!(Ipv6Addr::new(0xfe81, 0, 0, 0, 0, 0, 0, 0).has_unicast_link_local_scope(), true);
     /// ```
     #[rustc_const_unstable(feature = "const_ipv6", issue = "76205")]
     #[unstable(feature = "ip", issue = "27709")]
     #[inline]
-    pub const fn is_unicast_link_local(&self) -> bool {
+    pub const fn has_unicast_link_local_scope(&self) -> bool {
         (self.segments()[0] & 0xffc0) == 0xfe80
     }
 
@@ -1403,7 +1404,7 @@ impl Ipv6Addr {
     /// [RFC 4291 section 2.5.7]: https://datatracker.ietf.org/doc/html/rfc4291#section-2.5.7
     /// [unspecified address]: Ipv6Addr::is_unspecified
     /// [loopback address]: Ipv6Addr::is_loopback
-    /// [link-local address]: Ipv6Addr::is_unicast_link_local
+    /// [link-local address]: Ipv6Addr::has_unicast_link_local_scope
     ///
     /// # Examples
     ///
@@ -1413,33 +1414,33 @@ impl Ipv6Addr {
     /// use std::net::Ipv6Addr;
     ///
     /// // The unspecified address (`::`) does not have unicast global scope
-    /// assert_eq!(Ipv6Addr::UNSPECIFIED.is_unicast_global(), false);
+    /// assert_eq!(Ipv6Addr::UNSPECIFIED.has_unicast_global_scope(), false);
     ///
     /// // The loopback address (`::1`) does not have unicast global scope.
-    /// assert_eq!(Ipv6Addr::LOCALHOST.is_unicast_global(), false);
+    /// assert_eq!(Ipv6Addr::LOCALHOST.has_unicast_global_scope(), false);
     ///
     /// // A unicast address with link-local scope (`fe80::/10`) does not have global scope.
-    /// assert_eq!(Ipv6Addr::new(0xfe80, 0, 0, 0, 0, 0, 0, 0).is_unicast_global(), false);
+    /// assert_eq!(Ipv6Addr::new(0xfe80, 0, 0, 0, 0, 0, 0, 0).has_unicast_global_scope(), false);
     ///
     /// // A unicast address that had the deprecated site-local scope (`fec0::/10`) now has global scope.
-    /// assert_eq!(Ipv6Addr::new(0xfec2, 0, 0, 0, 0, 0, 0, 0).is_unicast_global(), true);
+    /// assert_eq!(Ipv6Addr::new(0xfec2, 0, 0, 0, 0, 0, 0, 0).has_unicast_global_scope(), true);
     ///
     /// // Any multicast address (`ff00::/8`) does not have unicast global scope;
     /// // there is a difference between unicast global scope and multicast global scope.
-    /// assert_eq!(Ipv6Addr::new(0xff03, 0, 0, 0, 0, 0, 0, 0).is_unicast_global(), false);
-    /// assert_eq!(Ipv6Addr::new(0xff0e, 0, 0, 0, 0, 0, 0, 0).is_unicast_global(), false);
+    /// assert_eq!(Ipv6Addr::new(0xff03, 0, 0, 0, 0, 0, 0, 0).has_unicast_global_scope(), false);
+    /// assert_eq!(Ipv6Addr::new(0xff0e, 0, 0, 0, 0, 0, 0, 0).has_unicast_global_scope(), false);
     ///
     /// // Any other address is defined as having unicast global scope.
-    /// assert_eq!(Ipv6Addr::new(0, 0, 0, 0, 0, 0xffff, 0xc00a, 0x2ff).is_unicast_global(), true);
+    /// assert_eq!(Ipv6Addr::new(0, 0, 0, 0, 0, 0xffff, 0xc00a, 0x2ff).has_unicast_global_scope(), true);
     /// ```
     #[rustc_const_unstable(feature = "const_ipv6", issue = "76205")]
     #[unstable(feature = "ip", issue = "27709")]
     #[inline]
-    pub const fn is_unicast_global(&self) -> bool {
+    pub const fn has_unicast_global_scope(&self) -> bool {
         self.is_unicast()
             && !self.is_unspecified()
             && !self.is_loopback()
-            && !self.is_unicast_link_local()
+            && !self.has_unicast_link_local_scope()
     }
 
     /// Returns the address's multicast scope if the address is multicast.

library/std/src/net/ip/tests.rs

@@ -518,14 +518,14 @@ fn ipv6_properties() {
                 assert!(!ip!($s).is_global());
             }
             if ($mask & unicast_link_local) == unicast_link_local {
-                assert!(ip!($s).is_unicast_link_local());
+                assert!(ip!($s).has_unicast_link_local_scope());
             } else {
-                assert!(!ip!($s).is_unicast_link_local());
+                assert!(!ip!($s).has_unicast_link_local_scope());
             }
             if ($mask & unicast_global) == unicast_global {
-                assert!(ip!($s).is_unicast_global());
+                assert!(ip!($s).has_unicast_global_scope());
             } else {
-                assert!(!ip!($s).is_unicast_global());
+                assert!(!ip!($s).has_unicast_global_scope());
             }
             if ($mask & documentation) == documentation {
                 assert!(ip!($s).is_documentation());
@@ -883,14 +883,14 @@ fn ipv6_const() {
     const IS_UNIQUE_LOCAL: bool = IP_ADDRESS.is_unique_local();
     assert!(!IS_UNIQUE_LOCAL);
 
-    const IS_UNICAST_LINK_LOCAL: bool = IP_ADDRESS.is_unicast_link_local();
-    assert!(!IS_UNICAST_LINK_LOCAL);
+    const HAS_UNICAST_LINK_LOCAL_SCOPE: bool = IP_ADDRESS.has_unicast_link_local_scope();
+    assert!(!HAS_UNICAST_LINK_LOCAL_SCOPE);
 
     const IS_DOCUMENTATION: bool = IP_ADDRESS.is_documentation();
     assert!(!IS_DOCUMENTATION);
 
-    const IS_UNICAST_GLOBAL: bool = IP_ADDRESS.is_unicast_global();
-    assert!(!IS_UNICAST_GLOBAL);
+    const HAS_UNICAST_GLOBAL_SCOPE: bool = IP_ADDRESS.has_unicast_global_scope();
+    assert!(!HAS_UNICAST_GLOBAL_SCOPE);
 
     const MULTICAST_SCOPE: Option<Ipv6MulticastScope> = IP_ADDRESS.multicast_scope();
     assert_eq!(MULTICAST_SCOPE, None);