Merge pull request #312 from jstasiak/make-ipcheck-build-again

Remove no longer existing IP address methods from ipcheck

Author: dtolnay

tools/ipcheck/impls/dotnet/IPCheck.cs

@@ -18,10 +18,8 @@ static void Main(string[] args)
             is_benchmarking = "<unsupported>",
             is_documentation = "<unsupported>",
             is_global = "<unsupported>",
-            is_ietf_protocol_assignment = "<unsupported>",
             is_shared = "<unsupported>",
             is_unicast_link_local = addr.IsIPv6LinkLocal,
-            is_unicast_site_local = addr.IsIPv6SiteLocal,
             is_unique_local = "<unsupported>",
             mc_scope_admin_local = "<unsupported>",
             mc_scope_global = "<unsupported>",

tools/ipcheck/impls/go/ipcheck.go

@@ -17,10 +17,8 @@ func main() {
         IsBenchmarking string
         IsDocumentation string
         IsGlobal bool
-        IsIetfProtocolAssignment string
         IsShared string
         IsUnicastLinkLocal bool
-        IsUnicastSiteLocal string
         IsUniqueLocal string
         McScopeAdminLocal string
         McScopeGlobal string
@@ -44,10 +42,8 @@ func main() {
         "<unsupported>", // IsBenchmarking
         "<unsupported>", // IsDocumentation
         ip.IsGlobalUnicast(), // IsGlobal
-        "<unsupported>", // IsIetfProtocolAssignment
         "<unsupported>", // IsShared
         ip.IsLinkLocalUnicast(), // IsUnicastLinkLocal
-        "<unsupported>", // IsUnicastSiteLocal
         "<unsupported>", // IsUniqueLocal
         "<unsupported>", // McScopeAdminLocal
         "<unsupported>", // McScopeGlobal
@@ -75,10 +71,8 @@ func main() {
     output = strings.Replace(output, "IsBenchmarking", "is_benchmarking", 1)
     output = strings.Replace(output, "IsDocumentation", "is_documentation", 1)
     output = strings.Replace(output, "IsGlobal", "is_global", 1)
-    output = strings.Replace(output, "IsIetfProtocolAssignment", "is_ietf_protocol_assignment", 1)
     output = strings.Replace(output, "IsShared", "is_shared", 1)
     output = strings.Replace(output, "IsUnicastLinkLocal", "is_unicast_link_local", 1)
-    output = strings.Replace(output, "IsUnicastSiteLocal", "is_unicast_site_local", 1)
     output = strings.Replace(output, "IsUniqueLocal", "is_unique_local", 1)
     output = strings.Replace(output, "McScopeAdminLocal", "mc_scope_admin_local", 1)
     output = strings.Replace(output, "McScopeGlobal", "mc_scope_global", 1)

tools/ipcheck/impls/java/IPCheck.java

@@ -15,10 +15,8 @@ public static void main(String []args) throws Exception {
             .append("\"is_benchmarking\":").append("\"<unsupported>\"").append(",")
             .append("\"is_documentation\":").append("\"<unsupported>\"").append(",")
             .append("\"is_global\":").append("\"<unsupported>\"").append(",")
-            .append("\"is_ietf_protocol_assignment\":").append("\"<unsupported>\"").append(",")
             .append("\"is_shared\":").append("\"<unsupported>\"").append(",")
             .append("\"is_unicast_link_local\":").append("\"<unsupported>\"").append(",")
-            .append("\"is_unicast_site_local\":").append("\"<unsupported>\"").append(",")
             .append("\"is_unique_local\":").append("\"<unsupported>\"").append(",")
             .append("\"mc_scope_admin_local\":").append("\"<unsupported>\"").append(",")
             .append("\"mc_scope_global\":").append(addr.isMCGlobal()).append(",")

tools/ipcheck/impls/python/ipcheck.py

@@ -16,10 +16,8 @@
     'is_benchmarking': "<unsupported>",
     'is_documentation': "<unsupported>",
     'is_global': addr.is_global,
-    'is_ietf_protocol_assignment': "<unsupported>",
     'is_shared': "<unsupported>",
     'is_unicast_link_local': addr.is_link_local,
-    'is_unicast_site_local': addr.is_site_local if addr.version == 6 else "<unsupported>",
     'is_unique_local': "<unsupported>",
     'mc_scope_admin_local': "<unsupported>",
     'mc_scope_global': "<unsupported>",

tools/ipcheck/impls/rust_current/main.rs

@@ -30,10 +30,6 @@ fn main() {
             IpAddr::V4(addr) => addr.is_reserved(),
             IpAddr::V6(_) => false,
         },
-        "is_ietf_protocol_assignment": match addr {
-            IpAddr::V4(addr) => addr.is_ietf_protocol_assignment(),
-            IpAddr::V6(_) => false,
-        },
         "is_benchmarking": match addr {
             IpAddr::V4(addr) => addr.is_benchmarking(),
             IpAddr::V6(_) => false,
@@ -48,10 +44,6 @@ fn main() {
             IpAddr::V4(_) => false,
             IpAddr::V6(addr) => addr.is_unique_local(),
         },
-        "is_unicast_site_local": match addr {
-            IpAddr::V4(_) => false,
-            IpAddr::V6(addr) => addr.is_unicast_site_local(),
-        },
         "mc_scope_iface_local": match addr {
             IpAddr::V4(_) => false,
             IpAddr::V6(addr) => addr.multicast_scope() == Some(Ipv6MulticastScope::InterfaceLocal),

tools/ipcheck/impls/rust_new/main.rs

@@ -42,10 +42,6 @@ fn main() {
             IpAddr::V4(addr) => addr.is_reserved(),
             IpAddr::V6(_) => false,
         },
-        "is_ietf_protocol_assignment": match addr {
-            IpAddr::V4(addr) => addr.is_ietf_protocol_assignment(),
-            IpAddr::V6(_) => false,
-        },
         "is_benchmarking": match addr {
             IpAddr::V4(addr) => addr.is_benchmarking(),
             IpAddr::V6(_) => false,
@@ -79,10 +75,6 @@ fn main() {
             IpAddr::V4(_) => false,
             IpAddr::V6(addr) => addr.is_unique_local(),
         },
-        "is_unicast_site_local": match addr {
-            IpAddr::V4(_) => false,
-            IpAddr::V6(addr) => addr.is_unicast_site_local(),
-        },
         "mc_scope_iface_local": match addr {
             IpAddr::V4(_) => false,
             IpAddr::V6(addr) => addr.multicast_scope() == Some(Ipv6MulticastScope::InterfaceLocal),