Update to percent-encoding 2.0

servo · Aug 17, 2019 · 734fa6d · 734fa6d
1 parent 9392180
commit 734fa6d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
@@ -42,7 +42,7 @@ mime_guess = "2.0.0-alpha.6"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 openssl = "0.10"
-percent-encoding = "1.0"
+percent-encoding = "2.0"
 pixels = {path = "../pixels"}
 profile_traits = {path = "../profile_traits"}
 rayon = "1"

diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
@@ -29,7 +29,7 @@ malloc_size_of_derive = "0.1"
 mime = "0.3"
 msg = {path = "../msg"}
 num-traits = "0.2"
-percent-encoding = "1.0"
+percent-encoding = "2.0"
 pixels = {path = "../pixels"}
 serde = "1.0"
 servo_arc = {path = "../servo_arc"}

diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs
@@ -653,14 +653,29 @@ pub fn trim_http_whitespace(mut slice: &[u8]) -> &[u8] {
 }
 
 pub fn http_percent_encode(bytes: &[u8]) -> String {
-    percent_encoding::define_encode_set! {
-        // This encode set is used for HTTP header values and is defined at
-        // https://tools.ietf.org/html/rfc5987#section-3.2
-        pub HTTP_VALUE = [percent_encoding::SIMPLE_ENCODE_SET] | {
-            ' ', '"', '%', '\'', '(', ')', '*', ',', '/', ':', ';', '<', '-', '>', '?',
-            '[', '\\', ']', '{', '}'
-        }
-    }
+    // This encode set is used for HTTP header values and is defined at
+    // https://tools.ietf.org/html/rfc5987#section-3.2
+    const HTTP_VALUE: &percent_encoding::AsciiSet = &percent_encoding::CONTROLS
+        .add(b' ')
+        .add(b'"')
+        .add(b'%')
+        .add(b'\'')
+        .add(b'(')
+        .add(b')')
+        .add(b'*')
+        .add(b',')
+        .add(b'/')
+        .add(b':')
+        .add(b';')
+        .add(b'<')
+        .add(b'-')
+        .add(b'>')
+        .add(b'?')
+        .add(b'[')
+        .add(b'\\')
+        .add(b']')
+        .add(b'{')
+        .add(b'}');
 
     percent_encoding::percent_encode(bytes, HTTP_VALUE).to_string()
 }
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -79,7 +79,7 @@ msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 num-traits = "0.2"
 parking_lot = "0.8"
-percent-encoding = "1.0"
+percent-encoding = "2.0"
 phf = "0.7"
 pixels = {path = "../pixels"}
 profile_traits = {path = "../profile_traits"}