Merge pull request #134 from coolreader18/rand08

Update rand to 0.8 and bump MSRV

Author: abonander

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "multipart"
 
-version = "0.17.1"
+version = "0.18.0"
 
 authors = ["Austin Bonander <[email protected]>"]
 
@@ -22,7 +22,7 @@ lazy_static = { version = "1.2.0", optional = true }
 log = "0.4"
 mime = "0.3.14"
 mime_guess = "2.0.1"
-rand = "0.7"
+rand = "0.8"
 safemem = { version = "0.3", optional = true }
 tempfile = "3"
 clippy = { version = ">=0.0, <0.1", optional = true}

README.md

@@ -5,7 +5,7 @@ Client- and server-side abstractions for HTTP file uploads (POST requests with
 Supports several different (**sync**hronous API) HTTP crates. 
 **Async**hronous (i.e. `futures`-based) API support will be provided by [multipart-async].
 
-##### Minimum supported Rust version: 1.33.0
+##### Minimum supported Rust version: 1.36.0
 
 ##### Maintenance Status: Passive
 

src/lib.rs

@@ -121,6 +121,7 @@ fn random_alphanumeric(len: usize) -> String {
     rand::thread_rng()
         .sample_iter(&rand::distributions::Alphanumeric)
         .take(len)
+        .map(|c| c as char)
         .collect()
 }
 

src/local_test.rs

@@ -28,7 +28,7 @@ const MAX_LEN: usize = 5;
 const MAX_DASHES: usize = 2;
 
 fn collect_rand<C: FromIterator<T>, T, F: FnMut() -> T>(mut gen: F) -> C {
-    (0..rand::thread_rng().gen_range(MIN_FIELDS, MAX_FIELDS))
+    (0..rand::thread_rng().gen_range(MIN_FIELDS..MAX_FIELDS))
         .map(|_| gen())
         .collect()
 }
@@ -326,15 +326,16 @@ fn gen_string() -> String {
     let mut rng_1 = rand::thread_rng();
     let mut rng_2 = rand::thread_rng();
 
-    let str_len_1 = rng_1.gen_range(MIN_LEN, MAX_LEN + 1);
-    let str_len_2 = rng_2.gen_range(MIN_LEN, MAX_LEN + 1);
-    let num_dashes = rng_1.gen_range(0, MAX_DASHES + 1);
+    let str_len_1 = rng_1.gen_range(MIN_LEN..=MAX_LEN);
+    let str_len_2 = rng_2.gen_range(MIN_LEN..=MAX_LEN);
+    let num_dashes = rng_1.gen_range(0..=MAX_DASHES);
 
     rng_1
         .sample_iter(&Alphanumeric)
         .take(str_len_1)
-        .chain(iter::repeat('-').take(num_dashes))
+        .chain(iter::repeat(b'-').take(num_dashes))
         .chain(rng_2.sample_iter(&Alphanumeric).take(str_len_2))
+        .map(|c| c as char)
         .collect()
 }
 

src/mock.rs

@@ -92,7 +92,7 @@ impl Write for HttpBuffer {
         }
 
         // Simulate the randomness of a network connection by not always reading everything
-        let len = self.rng.gen_range(1, buf.len() + 1);
+        let len = self.rng.gen_range(1..=buf.len());
 
         self.buf.write(&buf[..len])
     }
@@ -159,7 +159,7 @@ impl<'a> Read for ServerRequest<'a> {
         }
 
         // Simulate the randomness of a network connection by not always reading everything
-        let len = self.rng.gen_range(1, out.len() + 1);
+        let len = self.rng.gen_range(1..=out.len());
         self.data.read(&mut out[..len])
     }
 }