servo: Merge #10410 - Update webdriver (from Ms2ger:update-webdriver); r=jdm
authorMs2ger <Ms2ger@gmail.com>
Wed, 06 Apr 2016 23:25:55 +0500
changeset 338428 c80f407689fa946522680f5d320eb53b309bc029
parent 338427 7010406e4f37d8eb4ce6ae90f1ede377a7a6ff75
child 338429 b8c47b11e421a18b26593c1d2c6f10e95847d9e8
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdm
servo: Merge #10410 - Update webdriver (from Ms2ger:update-webdriver); r=jdm Source-Repo: https://github.com/servo/servo Source-Revision: 35fbcbe9a8cc6bf23debf6d84bdeb7c37f436741
servo/components/servo/Cargo.lock
servo/components/webdriver_server/Cargo.toml
servo/components/webdriver_server/lib.rs
servo/ports/cef/Cargo.lock
--- a/servo/components/servo/Cargo.lock
+++ b/servo/components/servo/Cargo.lock
@@ -2279,24 +2279,23 @@ source = "registry+https://github.com/ru
 dependencies = [
  "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "webdriver"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "webdriver_server"
 version = "0.0.1"
 dependencies = [
  "compositing 0.0.1",
  "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2305,17 +2304,17 @@ dependencies = [
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "plugins 0.0.1",
  "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
  "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "webdriver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webdriver 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "webrender"
 version = "0.1.0"
 source = "git+https://github.com/servo/webrender#03357a5ae9472723a8a9400f561367796390e6d2"
 dependencies = [
  "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/servo/components/webdriver_server/Cargo.toml
+++ b/servo/components/webdriver_server/Cargo.toml
@@ -26,9 +26,9 @@ git = "https://github.com/servo/ipc-chan
 [dependencies]
 image = "0.7"
 log = "0.3.5"
 hyper = "0.8"
 rustc-serialize = "0.3.4"
 regex = "0.1.55"
 url = {version = "0.5.7", features = ["heap_size"]}
 uuid = "0.1"
-webdriver = "0.7"
+webdriver = "0.8"
--- a/servo/components/webdriver_server/lib.rs
+++ b/servo/components/webdriver_server/lib.rs
@@ -597,17 +597,17 @@ impl Handler {
     fn handle_set_timeouts(&mut self, parameters: &TimeoutsParameters) -> WebDriverResult<WebDriverResponse> {
         //TODO: this conversion is crazy, spec should limit these to u32 and check upstream
         let value = parameters.ms as u32;
         match &parameters.type_[..] {
             "implicit" => self.implicit_wait_timeout = value,
             "page load" => self.load_timeout = value,
             "script" => self.script_timeout = value,
             x => return Err(WebDriverError::new(ErrorStatus::InvalidSelector,
-                                                &format!("Unknown timeout type {}", x)))
+                                                format!("Unknown timeout type {}", x)))
         }
         Ok(WebDriverResponse::Void)
     }
 
     fn handle_execute_script(&self, parameters: &JavascriptCommandParameters)
                              -> WebDriverResult<WebDriverResponse> {
         let func_body = &parameters.script;
         let args_string = "";
--- a/servo/ports/cef/Cargo.lock
+++ b/servo/ports/cef/Cargo.lock
@@ -2147,24 +2147,23 @@ source = "registry+https://github.com/ru
 dependencies = [
  "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-client 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "webdriver"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "webdriver_server"
 version = "0.0.1"
 dependencies = [
  "compositing 0.0.1",
  "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2173,17 +2172,17 @@ dependencies = [
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "plugins 0.0.1",
  "regex 0.1.55 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
  "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "webdriver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webdriver 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "webrender"
 version = "0.1.0"
 source = "git+https://github.com/servo/webrender#03357a5ae9472723a8a9400f561367796390e6d2"
 dependencies = [
  "app_units 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",