Switching to rust-url#1.0.0

Cargo.lock

@@ -364,7 +364,7 @@ dependencies = [
  "parity-status 0.2.2 (git+https://github.com/tomusdrw/parity-status.git)",
  "parity-wallet 0.1.1 (git+https://github.com/tomusdrw/parity-wallet.git)",
  "parity-webapp 0.1.0 (git+https://github.com/tomusdrw/parity-webapp.git)",
- "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -494,21 +494,22 @@ dependencies = [
 [[package]]
 name = "hyper"
 version = "0.9.0-mio"
-source = "git+https://github.com/hyperium/hyper?branch=mio#55c7d7a1d88001e529b3d3b3a6783548ce8c3d06"
+source = "git+https://github.com/hyperium/hyper?branch=mio#fab6c4173063a10f2aacfe3872150537da3dcfdd"
 dependencies = [
  "cookie 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rotor 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spmc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "vecio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1061,6 +1062,11 @@ dependencies = [
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "spmc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "strsim"
 version = "0.3.0"

webapp/Cargo.toml

@@ -12,7 +12,7 @@ log = "0.3"
 jsonrpc-core = "2.0"
 jsonrpc-http-server = { git = "https://github.com/debris/jsonrpc-http-server.git" }
 hyper = { default-features = false, git = "https://github.com/hyperium/hyper", branch = "mio" }
-url = "0.5"
+url = "1.0"
 ethcore-rpc = { path = "../rpc" }
 ethcore-util = { path = "../util" }
 parity-webapp = { git = "https://github.com/tomusdrw/parity-webapp.git" }

webapp/src/router/url.rs

@@ -17,8 +17,7 @@
 //! HTTP/HTTPS URL type. Based on URL type from Iron library.
 
 use url::Host;
-use url::{whatwg_scheme_type_mapper};
+use url::{self};
-use url::{self, SchemeData, SchemeType};
 
 /// HTTP/HTTPS URL type for Iron.
 #[derive(PartialEq, Eq, Clone, Debug)]
@@ -83,50 +82,38 @@ impl Url {
 
 	/// Create a `Url` from a `rust-url` `Url`.
 	pub fn from_generic_url(raw_url: url::Url) -> Result<Url, String> {
-		// Create an Iron URL by extracting the special scheme data.
+		// Extract the port as a 16-bit unsigned integer.
-		match raw_url.scheme_data {
+		let port: u16 = match raw_url.port_or_known_default() {
-			SchemeData::Relative(data) => {
+			Some(port) => port,
-				// Extract the port as a 16-bit unsigned integer.
+			None => {
-				let port: u16 = match data.port {
+				return Err(format!("Unknown port for scheme: `{}`", raw_url.scheme()))
-					// If explicitly defined, unwrap it.
+			}
-					Some(port) => port,
+		};
 
-					// Otherwise, use the scheme's default port.
+		// Map empty usernames to None.
-					None => {
+		let username = match &*raw_url.username() {
-					match whatwg_scheme_type_mapper(&raw_url.scheme) {
+			"" => None,
-						SchemeType::Relative(port) => port,
+			_ => Some(raw_url.username().to_owned())
-						_ => return Err(format!("Invalid special scheme: `{}`",
+		};
-												raw_url.scheme))
-					}
-					}
-				};
 
-				// Map empty usernames to None.
+		// Map empty passwords to None.
-				let username = match &*data.username {
+		let password = match raw_url.password() {
-					"" => None,
+			None => None,
-					_ => Some(data.username)
+			Some(ref x) if x.is_empty() => None,
-				};
+			Some(password) => Some(password.to_owned())
+		};
+		let as_string = |x: &str| x.to_owned();
 
-				// Map empty passwords to None.
+		Ok(Url {
-				let password = match data.password {
+			scheme: raw_url.scheme().to_owned(),
-					None => None,
+			host: raw_url.host().expect("Valid host, because only data:, mailto: protocols does not have host.").to_owned(),
-					Some(ref x) if x.is_empty() => None,
+			port: port,
-					Some(password) => Some(password)
+			path: raw_url.path_segments().expect("Valid path segments. In HTTP we won't get cannot-be-a-base URLs").map(&as_string).collect(),
-				};
+			username: username,
-
+			password: password,
-				Ok(Url {
+			query: raw_url.query().map(&as_string),
-					scheme: raw_url.scheme,
+			fragment: raw_url.fragment().map(&as_string),
-					host: data.host,
+		})
-					port: port,
-					path: data.path,
-					username: username,
-					password: password,
-					query: raw_url.query,
-					fragment: raw_url.fragment
-				})
-			},
-			_ => Err(format!("Not a special scheme: `{}`", raw_url.scheme))
-		}
 	}
 }