Fix for rust commit 3dcd2157403163789aaf21a9ab3c4d30a7c6494d 'Switch to ...

[CraZySacX]

...purely namespaced enums'

[tari]

Since lifthrasiir/rust-encoding#60 landed, some names from encoding changed too. The following patch fixes compilation against the new names.

diff --git a/src/form_urlencoded.rs b/src/form_urlencoded.rs
index 6e177e0..87556b8 100644
--- a/src/form_urlencoded.rs
+++ b/src/form_urlencoded.rs
@@ -81,7 +81,7 @@ pub fn parse_bytes(input: &[u8], encoding_override: Option<EncodingRef>,
     fn decode(input: Vec<u8>, encoding_override: EncodingRef) -> String {
         encoding_override.decode(
             percent_decode(input.as_slice()).as_slice(),
-            encoding::DecodeReplace).unwrap()
+            encoding::DecoderTrap::Replace).unwrap()
     }

     Some(pairs.into_iter().map(
@@ -115,7 +115,7 @@ pub fn serialize<'a, I: Iterator<(&'a str, &'a str)>>(
         let input = match encoding_override {
             None => input.as_bytes(),  // "Encode" to UTF-8
             Some(encoding) => {
-                keep_alive = encoding.encode(input, encoding::EncodeNcrEscape).unwrap();
+                keep_alive = encoding.encode(input, encoding::EncoderTrap::NcrEscape).unwrap();
                 keep_alive.as_slice()
             }
         };
diff --git a/src/parser.rs b/src/parser.rs
index 2a6c5e0..af09285 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -653,7 +653,7 @@ pub fn parse_query<'a>(input: &'a str, context: Context, parser: &UrlParser)
     let encoded;
     let query_bytes = match parser.query_encoding_override {
         Some(encoding) => {
-            encoded = encoding.encode(query.as_slice(), encoding::EncodeReplace).unwrap();
+            encoded = encoding.encode(query.as_slice(), encoding::EncoderTrap::Replace).unwrap();
             encoded.as_slice()
         },
         None => query.as_bytes()  // UTF-8

[SimonSapin]

I’m gonna do some refactoring to take advantage of the new behavior (read: breaking changes coming!), but I’ll start by taking this anyway. Thanks!