Upgrade quickcheck to 1.0, adjust code, optimizing a slow test

aquatic_http_protocol/Cargo.toml

@@ -43,5 +43,5 @@ urlencoding = "1"
 [dev-dependencies]
 bendy = { version = "0.3", features = ["std", "serde"] }
 criterion = "0.3"
-quickcheck = "0.9"
-quickcheck_macros = "0.9"
+quickcheck = "1.0"
+quickcheck_macros = "1.0"

aquatic_http_protocol/src/common.rs

@@ -60,7 +60,7 @@ impl FromStr for AnnounceEvent {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for InfoHash {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         let mut arr = [b'0'; 20];
 
         for byte in arr.iter_mut(){
@@ -74,7 +74,7 @@ impl quickcheck::Arbitrary for InfoHash {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for PeerId {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         let mut arr = [b'0'; 20];
 
         for byte in arr.iter_mut(){
@@ -88,7 +88,7 @@ impl quickcheck::Arbitrary for PeerId {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for AnnounceEvent {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         match (bool::arbitrary(g), bool::arbitrary(g)){
             (false, false) => Self::Started,
             (true, false) => Self::Started,

aquatic_http_protocol/src/request.rs

@@ -322,7 +322,7 @@ mod tests {
     }
 
     impl Arbitrary for AnnounceRequest {
-        fn arbitrary<G: Gen>(g: &mut G) -> Self {
+        fn arbitrary(g: &mut Gen) -> Self {
             let key: Option<String> = Arbitrary::arbitrary(g);
 
             AnnounceRequest {
@@ -339,7 +339,7 @@ mod tests {
     }
 
     impl Arbitrary for ScrapeRequest {
-        fn arbitrary<G: Gen>(g: &mut G) -> Self {
+        fn arbitrary(g: &mut Gen) -> Self {
             ScrapeRequest {
                 info_hashes: Arbitrary::arbitrary(g),
             }
@@ -347,7 +347,7 @@ mod tests {
     }
 
     impl Arbitrary for Request {
-        fn arbitrary<G: Gen>(g: &mut G) -> Self {
+        fn arbitrary(g: &mut Gen) -> Self {
             if Arbitrary::arbitrary(g){
                 Self::Announce(Arbitrary::arbitrary(g))
             } else {

aquatic_http_protocol/src/response.rs

@@ -192,7 +192,7 @@ impl Response {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for ResponsePeer<Ipv4Addr> {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         Self {
             ip_address: Ipv4Addr::arbitrary(g),
             port: u16::arbitrary(g)
@@ -203,7 +203,7 @@ impl quickcheck::Arbitrary for ResponsePeer<Ipv4Addr> {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for ResponsePeer<Ipv6Addr> {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         Self {
             ip_address: Ipv6Addr::arbitrary(g),
             port: u16::arbitrary(g)
@@ -214,7 +214,7 @@ impl quickcheck::Arbitrary for ResponsePeer<Ipv6Addr> {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for ResponsePeerListV4 {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         Self(Vec::arbitrary(g))
     }
 }
@@ -222,7 +222,7 @@ impl quickcheck::Arbitrary for ResponsePeerListV4 {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for ResponsePeerListV6 {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         Self(Vec::arbitrary(g))
     }
 }
@@ -230,7 +230,7 @@ impl quickcheck::Arbitrary for ResponsePeerListV6 {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for ScrapeStatistics {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         Self {
             complete: usize::arbitrary(g),
             incomplete: usize::arbitrary(g),
@@ -242,7 +242,7 @@ impl quickcheck::Arbitrary for ScrapeStatistics {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for AnnounceResponse {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         Self {
             announce_interval: usize::arbitrary(g),
             complete: usize::arbitrary(g),
@@ -256,7 +256,7 @@ impl quickcheck::Arbitrary for AnnounceResponse {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for ScrapeResponse {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         Self {
             files: BTreeMap::arbitrary(g),
         }
@@ -266,7 +266,7 @@ impl quickcheck::Arbitrary for ScrapeResponse {
 
 #[cfg(test)]
 impl quickcheck::Arbitrary for FailureResponse {
-    fn arbitrary<G: quickcheck::Gen>(g: &mut G) -> Self {
+    fn arbitrary(g: &mut quickcheck::Gen) -> Self {
         Self {
             failure_reason: String::arbitrary(g),
         }