Răsfoiți Sursa

Rename encoding_override to query_encoding_override.

Simon Sapin 12 ani în urmă
părinte
comite
54f6d73fb8
2 a modificat fișierele cu 5 adăugiri și 5 ștergeri
  1. 1 1
      src/parser.rs
  2. 4 4
      src/url.rs

+ 1 - 1
src/parser.rs

@@ -560,7 +560,7 @@ pub fn parse_query<'a>(input: &'a str, context: Context, parser: &UrlParser)
         }
         }
     }
     }
     let encoded;
     let encoded;
-    let query_bytes = match parser.encoding_override {
+    let query_bytes = match parser.query_encoding_override {
         Some(encoding) => {
         Some(encoding) => {
             encoded = encoding.encode(query.as_slice(), encoding::EncodeReplace).unwrap();
             encoded = encoding.encode(query.as_slice(), encoding::EncodeReplace).unwrap();
             encoded.as_slice()
             encoded.as_slice()

+ 4 - 4
src/url.rs

@@ -90,7 +90,7 @@ impl<S: hash::Writer> hash::Hash<S> for Url {
 
 
 pub struct UrlParser<'a> {
 pub struct UrlParser<'a> {
     base_url: Option<&'a Url>,
     base_url: Option<&'a Url>,
-    encoding_override: Option<EncodingRef>,
+    query_encoding_override: Option<EncodingRef>,
     error_handler: ErrorHandler,
     error_handler: ErrorHandler,
     schemes: fn(scheme: &str) -> SchemeType,
     schemes: fn(scheme: &str) -> SchemeType,
 }
 }
@@ -101,7 +101,7 @@ impl<'a> UrlParser<'a> {
     pub fn new() -> UrlParser<'a> {
     pub fn new() -> UrlParser<'a> {
         UrlParser {
         UrlParser {
             base_url: None,
             base_url: None,
-            encoding_override: None,
+            query_encoding_override: None,
             error_handler: silent_handler,
             error_handler: silent_handler,
             schemes: whatwg_schemes,
             schemes: whatwg_schemes,
         }
         }
@@ -114,8 +114,8 @@ impl<'a> UrlParser<'a> {
     }
     }
 
 
     #[inline]
     #[inline]
-    pub fn encoding_override<'b>(&'b mut self, value: EncodingRef) -> &'b mut UrlParser<'a> {
-        self.encoding_override = Some(value);
+    pub fn query_encoding_override<'b>(&'b mut self, value: EncodingRef) -> &'b mut UrlParser<'a> {
+        self.query_encoding_override = Some(value);
         self
         self
     }
     }