about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristopher Hotchkiss <christopher.hotchkiss@gmail.com>2022-07-30 13:05:33 -0400
committerChristopher Hotchkiss <christopher.hotchkiss@gmail.com>2022-07-30 13:05:33 -0400
commitf6590887df24f91a883da511d0a24d17ac4283e6 (patch)
tree46dbfb0ee3ee6820f2e7581dcd998394dfacabfe
parent3365b0631dad649ad9155c69cf9b6428e7b5228f (diff)
downloadrust-f6590887df24f91a883da511d0a24d17ac4283e6.tar.gz
rust-f6590887df24f91a883da511d0a24d17ac4283e6.zip
Original branch seems to have missed excluding the benchmark range from the globally reachable change
-rw-r--r--library/std/src/net/ip.rs1
-rw-r--r--library/std/src/net/ip/tests.rs10
2 files changed, 3 insertions, 8 deletions
diff --git a/library/std/src/net/ip.rs b/library/std/src/net/ip.rs
index ebbb69e7065..3c795f976f8 100644
--- a/library/std/src/net/ip.rs
+++ b/library/std/src/net/ip.rs
@@ -1635,6 +1635,7 @@ impl Ipv6Addr {
             && !self.is_unique_local()
             && !self.is_unspecified()
             && !self.is_documentation()
+            && !self.is_benchmarking()
     }
 
     /// Returns the address's multicast scope if the address is multicast.
diff --git a/library/std/src/net/ip/tests.rs b/library/std/src/net/ip/tests.rs
index 0311efa8625..f5051d65fc7 100644
--- a/library/std/src/net/ip/tests.rs
+++ b/library/std/src/net/ip/tests.rs
@@ -329,7 +329,7 @@ fn ip_properties() {
     check!("ff08::", global | multicast);
     check!("ff0e::", global | multicast);
     check!("2001:db8:85a3::8a2e:370:7334", doc);
-    check!("2001:2::ac32:23ff:21", global | benchmarking);
+    check!("2001:2::ac32:23ff:21", benchmarking);
     check!("102:304:506:708:90a:b0c:d0e:f10", global);
 }
 
@@ -760,12 +760,6 @@ fn ipv6_properties() {
     );
 
     check!(
-        "2001:2::ac32:23ff:21",
-        &[0x20, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0xac, 0x32, 0x23, 0xff, 0, 0x21],
-        unicast_global
-    );
-
-    check!(
         "2001:db8:85a3::8a2e:370:7334",
         &[0x20, 1, 0xd, 0xb8, 0x85, 0xa3, 0, 0, 0, 0, 0x8a, 0x2e, 3, 0x70, 0x73, 0x34],
         documentation
@@ -774,7 +768,7 @@ fn ipv6_properties() {
     check!(
         "2001:2::ac32:23ff:21",
         &[0x20, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0xac, 0x32, 0x23, 0xff, 0, 0x21],
-        global | unicast_global | benchmarking
+        benchmarking
     );
 
     check!(