Rename SchemeRelativeUrl to RelativeSchemeData.

src/parser.rs

@@ -14,8 +14,7 @@ use encoding;
 use encoding::EncodingRef;
 
 use super::{
-    ParseResult, ErrorHandler, Url, RelativeSchemeData, OtherSchemeData,
-    SchemeRelativeUrl, Host, Domain,
+    ParseResult, ErrorHandler, Url, RelativeSchemeData, OtherSchemeData, Host, Domain,
     utf8_percent_encode, percent_encode};
 use encode_sets::{SIMPLE_ENCODE_SET, DEFAULT_ENCODE_SET, USERINFO_ENCODE_SET, QUERY_ENCODE_SET};
 
@@ -65,7 +64,7 @@ pub fn parse_url(input: &str, base_url: Option<&Url>, encoding_override: Option<
                 parse_relative_url(remaining, scheme, base, query, encoding_override, parse_error)
             },
             // FIXME: Should not have to use a made-up base URL.
-            _ => parse_relative_url(remaining, scheme, &SchemeRelativeUrl {
+            _ => parse_relative_url(remaining, scheme, &RelativeSchemeData {
                 username: String::new(), password: None, host: Domain(String::new()),
                 port: String::new(), path: Vec::new()
             }, &None, encoding_override, parse_error)
@@ -124,7 +123,7 @@ fn parse_absolute_url<'a>(scheme: String, input: &'a str, encoding_override: Opt
     let (host, port, remaining) = try!(parse_host(remaining, scheme.as_slice(), parse_error));
     let (path, remaining) = try!(parse_path_start(
         remaining, UrlParserContext, NonFileScheme, parse_error));
-    let scheme_data = RelativeSchemeData(SchemeRelativeUrl {
+    let scheme_data = RelativeSchemeData(RelativeSchemeData {
         username: username, password: password, host: host, port: port, path: path });
     let (query, fragment) = try!(parse_query_and_fragment(
         remaining, encoding_override, parse_error));
@@ -133,7 +132,7 @@ fn parse_absolute_url<'a>(scheme: String, input: &'a str, encoding_override: Opt
 }
 
 
-fn parse_relative_url<'a>(input: &'a str, scheme: String, base: &SchemeRelativeUrl,
+fn parse_relative_url<'a>(input: &'a str, scheme: String, base: &RelativeSchemeData,
                           base_query: &Option<String>, encoding_override: Option<EncodingRef>,
                           parse_error: ErrorHandler)
                           -> ParseResult<Url> {
@@ -166,7 +165,7 @@ fn parse_relative_url<'a>(input: &'a str, scheme: String, base: &SchemeRelativeU
                     let (path, remaining) = try!(parse_path_start(
                         remaining, UrlParserContext,
                         scheme_type, parse_error));
-                    let scheme_data = RelativeSchemeData(SchemeRelativeUrl {
+                    let scheme_data = RelativeSchemeData(RelativeSchemeData {
                         username: String::new(), password: None,
                         host: host, port: String::new(), path: path
                     });
@@ -184,12 +183,12 @@ fn parse_relative_url<'a>(input: &'a str, scheme: String, base: &SchemeRelativeU
                     [], input.slice_from(1), UrlParserContext,
                     scheme_type, parse_error));
                 let scheme_data = RelativeSchemeData(if scheme_type == FileScheme {
-                    SchemeRelativeUrl {
+                    RelativeSchemeData {
                         username: String::new(), password: None, host:
                         Domain(String::new()), port: String::new(), path: path
                     }
                 } else {
-                    SchemeRelativeUrl {
+                    RelativeSchemeData {
                         username: base.username.clone(),
                         password: base.password.clone(),
                         host: base.host.clone(),
@@ -230,7 +229,7 @@ fn parse_relative_url<'a>(input: &'a str, scheme: String, base: &SchemeRelativeU
                 let (path, remaining) = try!(parse_path(
                     [], input, UrlParserContext,
                     scheme_type, parse_error));
-                 (RelativeSchemeData(SchemeRelativeUrl {
+                 (RelativeSchemeData(RelativeSchemeData {
                     username: String::new(), password: None,
                     host: Domain(String::new()),
                     port: String::new(),
@@ -242,7 +241,7 @@ fn parse_relative_url<'a>(input: &'a str, scheme: String, base: &SchemeRelativeU
                 let (path, remaining) = try!(parse_path(
                     base_path, input, UrlParserContext,
                     scheme_type, parse_error));
-                (RelativeSchemeData(SchemeRelativeUrl {
+                (RelativeSchemeData(RelativeSchemeData {
                     username: base.username.clone(),
                     password: base.password.clone(),
                     host: base.host.clone(),

src/tests.rs

@@ -9,7 +9,7 @@
 
 use std::char;
 use std::u32;
-use super::{Url, RelativeSchemeData, SchemeRelativeUrl, OtherSchemeData};
+use super::{Url, RelativeSchemeData, OtherSchemeData};
 
 
 #[test]
@@ -68,7 +68,7 @@ fn test_url_parsing() {
 
         assert_eq!(Some(scheme), expected_scheme);
         match scheme_data {
-            RelativeSchemeData(SchemeRelativeUrl { username, password, host, port, path }) => {
+            RelativeSchemeData(RelativeSchemeData { username, password, host, port, path }) => {
                 assert_eq!(username, expected_username);
                 assert_eq!(password, expected_password);
                 let host = host.serialize();

src/url.rs

@@ -44,12 +44,12 @@ pub struct Url {
 
 #[deriving(PartialEq, Eq, Clone)]
 pub enum SchemeData {
-    RelativeSchemeData(SchemeRelativeUrl),
+    RelativeSchemeData(RelativeSchemeData),
     OtherSchemeData(String),  // data: URLs, mailto: URLs, etc.
 }
 
 #[deriving(PartialEq, Eq, Clone)]
-pub struct SchemeRelativeUrl {
+pub struct RelativeSchemeData {
     pub username: String,
     pub password: Option<String>,
     pub host: Host,
@@ -153,7 +153,7 @@ impl Url {
         let mut result = self.scheme.clone();
         result.push_str(":");
         match self.scheme_data {
-            RelativeSchemeData(SchemeRelativeUrl {
+            RelativeSchemeData(RelativeSchemeData {
                 ref username, ref password, ref host, ref port, ref path
             }) => {
                 result.push_str("//");
@@ -225,7 +225,7 @@ impl UrlUtils for Url {
     /// `URLUtils.username` setter
     fn set_username(&mut self, input: &str) -> ParseResult<()> {
         match self.scheme_data {
-            RelativeSchemeData(SchemeRelativeUrl { ref mut username, .. }) => {
+            RelativeSchemeData(RelativeSchemeData { ref mut username, .. }) => {
                 username.truncate(0);
                 utf8_percent_encode(input, USERNAME_ENCODE_SET, username);
                 Ok(())
@@ -237,7 +237,7 @@ impl UrlUtils for Url {
     /// `URLUtils.password` setter
     fn set_password(&mut self, input: &str) -> ParseResult<()> {
         match self.scheme_data {
-            RelativeSchemeData(SchemeRelativeUrl { ref mut password, .. }) => {
+            RelativeSchemeData(RelativeSchemeData { ref mut password, .. }) => {
                 let mut new_password = String::new();
                 utf8_percent_encode(input, PASSWORD_ENCODE_SET, &mut new_password);
                 *password = Some(new_password);
@@ -250,7 +250,7 @@ impl UrlUtils for Url {
     /// `URLUtils.host` setter
     fn set_host_and_port(&mut self, input: &str) -> ParseResult<()> {
         match self.scheme_data {
-            RelativeSchemeData(SchemeRelativeUrl { ref mut host, ref mut port, .. }) => {
+            RelativeSchemeData(RelativeSchemeData { ref mut host, ref mut port, .. }) => {
                 let (new_host, new_port, _) = try!(parser::parse_host(
                     input, self.scheme.as_slice(), silent_handler));
                 *host = new_host;
@@ -264,7 +264,7 @@ impl UrlUtils for Url {
     /// `URLUtils.hostname` setter
     fn set_host(&mut self, input: &str) -> ParseResult<()> {
         match self.scheme_data {
-            RelativeSchemeData(SchemeRelativeUrl { ref mut host, .. }) => {
+            RelativeSchemeData(RelativeSchemeData { ref mut host, .. }) => {
                 let (new_host, _) = try!(parser::parse_hostname(
                     input, silent_handler));
                 *host = new_host;
@@ -277,7 +277,7 @@ impl UrlUtils for Url {
     /// `URLUtils.port` setter
     fn set_port(&mut self, input: &str) -> ParseResult<()> {
         match self.scheme_data {
-            RelativeSchemeData(SchemeRelativeUrl { ref mut port, .. }) => {
+            RelativeSchemeData(RelativeSchemeData { ref mut port, .. }) => {
                 if self.scheme.as_slice() == "file" {
                     return Err("Can not set port on file: URL.")
                 }
@@ -293,7 +293,7 @@ impl UrlUtils for Url {
     /// `URLUtils.pathname` setter
     fn set_path(&mut self, input: &str) -> ParseResult<()> {
         match self.scheme_data {
-            RelativeSchemeData(SchemeRelativeUrl { ref mut path, .. }) => {
+            RelativeSchemeData(RelativeSchemeData { ref mut path, .. }) => {
                 let (new_path, _) = try!(parser::parse_path_start(
                     input, parser::SetterContext,
                     if self.scheme.as_slice() == "file" { parser::FileScheme }