Update for changes to rust-encoding

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()
             }
         };

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