From d8b006f6927b10ad76f16411c9c8c7c8df533f64 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Wed, 6 Apr 2016 23:26:25 +0501 Subject: [PATCH] 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 | 5 ++--- servo/components/webdriver_server/Cargo.toml | 2 +- servo/components/webdriver_server/lib.rs | 2 +- servo/ports/cef/Cargo.lock | 5 ++--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/servo/components/servo/Cargo.lock b/servo/components/servo/Cargo.lock index 927d1aab7bfd..935e603067ab 100644 --- a/servo/components/servo/Cargo.lock +++ b/servo/components/servo/Cargo.lock @@ -2284,14 +2284,13 @@ dependencies = [ [[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]] @@ -2310,7 +2309,7 @@ dependencies = [ "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]] diff --git a/servo/components/webdriver_server/Cargo.toml b/servo/components/webdriver_server/Cargo.toml index 55d599bba052..720d7689c255 100644 --- a/servo/components/webdriver_server/Cargo.toml +++ b/servo/components/webdriver_server/Cargo.toml @@ -31,4 +31,4 @@ 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" diff --git a/servo/components/webdriver_server/lib.rs b/servo/components/webdriver_server/lib.rs index 90752f28686f..03ea0291caf0 100644 --- a/servo/components/webdriver_server/lib.rs +++ b/servo/components/webdriver_server/lib.rs @@ -602,7 +602,7 @@ impl Handler { "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) } diff --git a/servo/ports/cef/Cargo.lock b/servo/ports/cef/Cargo.lock index 3e653037a9eb..b91f233c3bbb 100644 --- a/servo/ports/cef/Cargo.lock +++ b/servo/ports/cef/Cargo.lock @@ -2152,14 +2152,13 @@ dependencies = [ [[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]] @@ -2178,7 +2177,7 @@ dependencies = [ "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]]