Skip to content

Commit f659088

Browse files
committed
Original branch seems to have missed excluding the benchmark range from the globally reachable change
1 parent 3365b06 commit f659088

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

library/std/src/net/ip.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1635,6 +1635,7 @@ impl Ipv6Addr {
16351635
&& !self.is_unique_local()
16361636
&& !self.is_unspecified()
16371637
&& !self.is_documentation()
1638+
&& !self.is_benchmarking()
16381639
}
16391640

16401641
/// Returns the address's multicast scope if the address is multicast.

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ fn ip_properties() {
329329
check!("ff08::", global | multicast);
330330
check!("ff0e::", global | multicast);
331331
check!("2001:db8:85a3::8a2e:370:7334", doc);
332-
check!("2001:2::ac32:23ff:21", global | benchmarking);
332+
check!("2001:2::ac32:23ff:21", benchmarking);
333333
check!("102:304:506:708:90a:b0c:d0e:f10", global);
334334
}
335335

@@ -759,12 +759,6 @@ fn ipv6_properties() {
759759
multicast_global | global
760760
);
761761

762-
check!(
763-
"2001:2::ac32:23ff:21",
764-
&[0x20, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0xac, 0x32, 0x23, 0xff, 0, 0x21],
765-
unicast_global
766-
);
767-
768762
check!(
769763
"2001:db8:85a3::8a2e:370:7334",
770764
&[0x20, 1, 0xd, 0xb8, 0x85, 0xa3, 0, 0, 0, 0, 0x8a, 0x2e, 3, 0x70, 0x73, 0x34],
@@ -774,7 +768,7 @@ fn ipv6_properties() {
774768
check!(
775769
"2001:2::ac32:23ff:21",
776770
&[0x20, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0xac, 0x32, 0x23, 0xff, 0, 0x21],
777-
global | unicast_global | benchmarking
771+
benchmarking
778772
);
779773

780774
check!(

0 commit comments

Comments
 (0)