fix (mutating) BitString implementation for AnyIpCidr

Author: stbuehler

src/cidr/any.rs

@@ -293,8 +293,8 @@ impl bitstring::BitString for AnyIpCidr {
 		} else {
 			match self {
 				Self::Any => unreachable!(),
-				Self::V4(mut c) => c.set(ndx - 1, bit),
-				Self::V6(mut c) => c.set(ndx - 1, bit),
+				Self::V4(ref mut c) => c.set(ndx - 1, bit),
+				Self::V6(ref mut c) => c.set(ndx - 1, bit),
 			}
 		}
 	}
@@ -310,8 +310,8 @@ impl bitstring::BitString for AnyIpCidr {
 		} else {
 			match self {
 				Self::Any => unreachable!(),
-				Self::V4(mut c) => c.flip(ndx - 1),
-				Self::V6(mut c) => c.flip(ndx - 1),
+				Self::V4(ref mut c) => c.flip(ndx - 1),
+				Self::V6(ref mut c) => c.flip(ndx - 1),
 			}
 		}
 	}
@@ -334,8 +334,8 @@ impl bitstring::BitString for AnyIpCidr {
 		} else {
 			match self {
 				Self::Any => (),
-				Self::V4(mut c) => c.clip(len - 1),
-				Self::V6(mut c) => c.clip(len - 1),
+				Self::V4(ref mut c) => c.clip(len - 1),
+				Self::V6(ref mut c) => c.clip(len - 1),
 			}
 		}
 	}
@@ -349,8 +349,8 @@ impl bitstring::BitString for AnyIpCidr {
 					*self = Self::V4(Ipv4Cidr::null());
 				}
 			},
-			Self::V4(mut c) => c.append(bit),
-			Self::V6(mut c) => c.append(bit),
+			Self::V4(ref mut c) => c.append(bit),
+			Self::V6(ref mut c) => c.append(bit),
 		}
 	}
 

src/cidr/bitstring_tests.rs

@@ -0,0 +1,43 @@
+use bitstring::BitString;
+
+use crate::{
+	AnyIpCidr,
+	Ipv4Cidr,
+	Ipv6Cidr,
+};
+
+#[test]
+fn ipv4_clip() {
+	let mut c = "192.168.0.0/16".parse::<Ipv4Cidr>().unwrap();
+	c.clip(2);
+	assert_eq!(c.len(), 2);
+	assert_eq!(c, "192.0.0.0/2".parse::<Ipv4Cidr>().unwrap());
+}
+
+#[test]
+fn ipv4_any_clip() {
+	use bitstring::BitString;
+	let mut c = "192.168.0.0/16".parse::<AnyIpCidr>().unwrap();
+	c.clip(2);
+	assert_eq!(c.len(), 2);
+	assert_eq!(c, "128.0.0.0/1".parse::<AnyIpCidr>().unwrap());
+}
+
+#[test]
+fn ipv6_clip() {
+	use bitstring::BitString;
+	let mut c = "2001:db8:1234:5678::/64".parse::<Ipv6Cidr>().unwrap();
+	c.clip(4);
+	assert_eq!(c.len(), 4);
+	assert_eq!(c, "2000::/4".parse::<Ipv6Cidr>().unwrap());
+}
+
+#[test]
+fn ipv6_any_clip() {
+	use bitstring::BitString;
+	let mut c = "2001:db8:1234:5678::/64".parse::<AnyIpCidr>().unwrap();
+	c.clip(4);
+	assert_eq!(c.len(), 4);
+	assert_eq!(c, "2000::/3".parse::<AnyIpCidr>().unwrap());
+}
+

src/cidr/mod.rs

@@ -8,6 +8,9 @@ mod serde;
 
 #[cfg(test)]
 mod tests;
+#[cfg(feature = "bitstring")]
+#[cfg(test)]
+mod bitstring_tests;
 
 use std::net::{
 	Ipv4Addr,