Przeglądaj źródła

Merge pull request #48 from chris-morgan/master

Rust update: no more `[T, ..n]` -> `&[T]` coercion
Manish Goregaokar 12 lat temu
rodzic
commit
f5fdbe5741
2 zmienionych plików z 5 dodań i 5 usunięć
  1. 1 1
      src/form_urlencoded.rs
  2. 4 4
      src/parser.rs

+ 1 - 1
src/form_urlencoded.rs

@@ -124,7 +124,7 @@ pub fn serialize<'a, I: Iterator<(&'a str, &'a str)>>(
             if byte == b' ' {
                 output.push_str("+")
             } else {
-                percent_encode_to([byte], FORM_URLENCODED_ENCODE_SET, output)
+                percent_encode_to(&[byte], FORM_URLENCODED_ENCODE_SET, output)
             }
         }
     }

+ 4 - 4
src/parser.rs

@@ -248,7 +248,7 @@ fn parse_relative_url<'a>(input: &'a str, scheme: String, scheme_type: SchemeTyp
             } else {
                 // Relative path state
                 let (path, remaining) = try!(parse_path(
-                    [], input.slice_from(1), UrlParserContext, scheme_type, parser));
+                    &[], input.slice_from(1), UrlParserContext, scheme_type, parser));
                 let scheme_data = RelativeSchemeData(if scheme_type == FileLikeRelativeScheme {
                     UrlRelativeSchemeData {
                         username: String::new(), password: None, host:
@@ -290,7 +290,7 @@ fn parse_relative_url<'a>(input: &'a str, scheme: String, scheme_type: SchemeTyp
             {
                 // Windows drive letter quirk
                 let (path, remaining) = try!(parse_path(
-                    [], input, UrlParserContext, scheme_type, parser));
+                    &[], input, UrlParserContext, scheme_type, parser));
                  (RelativeSchemeData(UrlRelativeSchemeData {
                     username: String::new(), password: None,
                     host: Domain(String::new()),
@@ -493,7 +493,7 @@ pub fn parse_standalone_path(input: &str, parser: &UrlParser)
         }
     }
     let (path, remaining) = try!(parse_path(
-        [], input.slice_from(1), UrlParserContext, RelativeScheme(0), parser));
+        &[], input.slice_from(1), UrlParserContext, RelativeScheme(0), parser));
     let (query, fragment) = try!(parse_query_and_fragment(remaining, parser));
     Ok((path, query, fragment))
 }
@@ -514,7 +514,7 @@ pub fn parse_path_start<'a>(input: &'a str, context: Context, scheme_type: Schem
             _ => ()
         }
     }
-    parse_path([], input.slice_from(i), context, scheme_type, parser)
+    parse_path(&[], input.slice_from(i), context, scheme_type, parser)
 }