Merge pull request #29 from Keruspe/master

Update dependencies

4 files changed, 13 insertions, 27 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 1c0cddf..3b296e0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,14 +19,14 @@ repository = "samscott89/serde_qs"
 actix-web = { version ="1.0.0", optional = true }
 data-encoding = "2.1.2"
 error-chain = "0.12.0"
-percent-encoding = "1.0.1"
+percent-encoding = "2.1.0"
 serde = "1.0.85"
 
 [dev-dependencies]
 csv = "1.0.5"
-rand = "0.6.4"
+rand = "0.7.3"
 serde_derive = "1.0.85"
-serde_urlencoded = "0.5.4"
+serde_urlencoded = "0.6.1"
 
 [features]
 default = []
diff --git a/examples/introduction.rs b/examples/introduction.rs
index 34cb530..fb91b3e 100644
--- a/examples/introduction.rs
+++ b/examples/introduction.rs
@@ -4,7 +4,7 @@ extern crate serde_derive;
 extern crate serde_qs as qs;
 extern crate serde_urlencoded as urlencoded;
 
-use rand::Rng;
+use rand::seq::SliceRandom;
 use std::collections::HashMap;
 
 use qs::Config;
@@ -104,7 +104,7 @@ fn main() {
     let mut rng = rand::thread_rng();
     for _ in 0..10 {
         let mut acc = String::new();
-        rng.shuffle(&mut inputs);
+        inputs.shuffle(&mut rng);
         for input in &inputs {
             acc += input;
             acc += "&";
diff --git a/src/lib.rs b/src/lib.rs
index b08c49c..bfbb9c3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -160,10 +160,10 @@
 
 #![allow()]
 #![deny(
+    arithmetic_overflow,
     const_err,
     dead_code,
     deprecated,
-    exceeding_bitshifts,
     improper_ctypes,
     missing_docs,
     mutable_transmutes,
@@ -174,7 +174,6 @@
     non_upper_case_globals,
     overflowing_literals,
     path_statements,
-    plugin_as_library,
     stable_features,
     trivial_casts,
     trivial_numeric_casts,
diff --git a/src/ser.rs b/src/ser.rs
index 1530edc..9086ad2 100644
--- a/src/ser.rs
+++ b/src/ser.rs
@@ -1,7 +1,7 @@
 //! Serialization support for querystrings.
 
 use data_encoding::BASE64URL_NOPAD as BASE64;
-use percent_encoding::{percent_encode, EncodeSet};
+use percent_encoding::{percent_encode, AsciiSet, NON_ALPHANUMERIC};
 use serde::ser;
 
 use error::*;
@@ -11,25 +11,12 @@ use std::fmt::Display;
 use std::io::Write;
 use std::str;
 
-#[allow(non_camel_case_types)]
-#[derive(Clone)]
-struct QS_ENCODE_SET;
-
-impl EncodeSet for QS_ENCODE_SET {
-    fn contains(&self, byte: u8) -> bool {
-        match byte {
-            b' '
-            | b'*'
-            | b'-'
-            | b'.'
-            | b'0'..=b'9'
-            | b'A'..=b'Z'
-            | b'_'
-            | b'a'..=b'z' => false,
-            _ => true,
-        }
-    }
-}
+const QS_ENCODE_SET: &AsciiSet = &NON_ALPHANUMERIC
+    .remove(b' ')
+    .remove(b'*')
+    .remove(b'-')
+    .remove(b'.')
+    .remove(b'_');
 
 /// Serializes a value into a querystring.
 ///