Merge pull request #78 from retep998/update

Fix `iter()` and `FromStr` changes.

src/form_urlencoded.rs

@@ -118,7 +118,7 @@ pub fn serialize_with_encoding<'a, I>(pairs: I, encoding_override: Option<::enco
     serialize_internal(pairs, EncodingOverride::from_opt_encoding(encoding_override))
 }
 
-fn serialize_internal<'a, I>(mut pairs: I, encoding_override: EncodingOverride) -> String
+fn serialize_internal<'a, I>(pairs: I, encoding_override: EncodingOverride) -> String
                              where I: Iterator<Item = (&'a str, &'a str)> {
     #[inline]
     fn byte_serialize(input: &str, output: &mut String,

src/parser.rs

@@ -515,7 +515,7 @@ fn parse_path<'a>(base_path: &[String], input: &'a str, context: Context,
         let mut path_part = String::new();
         let mut ends_with_slash = false;
         end = input.len();
-        for (i, c, next_i) in iter {
+        while let Some((i, c, next_i)) = iter.next() {
             match c {
                 '/' => {
                     ends_with_slash = true;

src/tests.rs

@@ -184,7 +184,7 @@ fn unescape(input: &str) -> String {
                             hex.push(chars.next().unwrap());
                             hex.push(chars.next().unwrap());
                             hex.push(chars.next().unwrap());
-                            from_str_radix(hex.as_slice(), 16)
+                            from_str_radix(hex.as_slice(), 16).ok()
                                 .and_then(char::from_u32).unwrap()
                         }
                         _ => panic!("Invalid test data input"),