diff options
| author | bors <bors@rust-lang.org> | 2015-07-20 04:52:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-20 04:52:12 +0000 |
| commit | 5e3b756f28a20969b30494d2289db4a40b6eb805 (patch) | |
| tree | d764b5782c08a88022a3666d7eb811f11ba7cb56 | |
| parent | c70417bd1b74e08af5b23e0ba3092446302da4f8 (diff) | |
| parent | d45c22b29f11f68ae08ea877d6b048754be614af (diff) | |
Auto merge of #27038 - ktossell:narrow_doc_ip_ranges, r=alexcrichton
Ipv4Addr::is_documentation() matches 513 /24 blocks when it should only match 3.
| -rw-r--r-- | src/libstd/net/ip.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs index 3fe44d4809e..61abadd88f1 100644 --- a/src/libstd/net/ip.rs +++ b/src/libstd/net/ip.rs @@ -149,9 +149,9 @@ impl Ipv4Addr { /// - 203.0.113.0/24 (TEST-NET-3) pub fn is_documentation(&self) -> bool { match(self.octets()[0], self.octets()[1], self.octets()[2], self.octets()[3]) { - (192, _, 2, _) => true, + (192, 0, 2, _) => true, (198, 51, 100, _) => true, - (203, _, 113, _) => true, + (203, 0, 113, _) => true, _ => false } } @@ -694,11 +694,15 @@ mod tests { check(&[127, 1, 2, 3], false, true, false, false, false, false, false, false); check(&[172, 31, 254, 253], false, false, true, false, false, false, false, false); check(&[169, 254, 253, 242], false, false, false, true, false, false, false, false); + check(&[192, 0, 2, 183], false, false, false, false, false, false, false, true); + check(&[192, 1, 2, 183], false, false, false, false, true, false, false, false); check(&[192, 168, 254, 253], false, false, true, false, false, false, false, false); + check(&[198, 51, 100, 0], false, false, false, false, false, false, false, true); + check(&[203, 0, 113, 0], false, false, false, false, false, false, false, true); + check(&[203, 2, 113, 0], false, false, false, false, true, false, false, false); check(&[224, 0, 0, 0], false, false, false, false, true, true, false, false); check(&[239, 255, 255, 255], false, false, false, false, true, true, false, false); - check(&[255, 255, 255, 255], false, false, false, false, false, false, true, false); - check(&[198, 51, 100, 0], false, false, false, false, false, false, false, true); + check(&[255, 255, 255, 255], false, false, false, false, false, false, true, false); } #[test] |