From 58d95a4cbedc9cd19f766a909273b4cdf02dc98f Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 22 Jul 2015 23:57:32 +0100 Subject: [PATCH] geckodriver: Update dependencies and remove some bogus ones Source-Repo: https://github.com/mozilla/geckodriver Source-Revision: dc3d0ffa9feb3141010281bfcd8572eb9c770cae --HG-- extra : rebase_source : eb7c935886a3810f2006501002e506c985c161c1 --- testing/geckodriver/Cargo.lock | 193 +++++++++++++++++++++++--------- testing/geckodriver/Cargo.toml | 4 +- testing/geckodriver/src/main.rs | 2 - 3 files changed, 138 insertions(+), 61 deletions(-) diff --git a/testing/geckodriver/Cargo.lock b/testing/geckodriver/Cargo.lock index 19ec60405e9e..d26e97d19b91 100644 --- a/testing/geckodriver/Cargo.lock +++ b/testing/geckodriver/Cargo.lock @@ -1,38 +1,53 @@ [root] name = "wires" -version = "0.1.0" +version = "0.2.0" dependencies = [ - "argparse 0.1.3 (git+https://github.com/tailhook/rust-argparse.git)", + "argparse 0.2.0 (git+https://github.com/tailhook/rust-argparse.git)", "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "mozprofile 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "mozrunner 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "webdriver 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "webdriver 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "advapi32-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "aho-corasick" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "argparse" -version = "0.1.3" -source = "git+https://github.com/tailhook/rust-argparse.git#3069b3e594d53808b7be53967a8a3f3a2efff6d4" +version = "0.2.0" +source = "git+https://github.com/tailhook/rust-argparse.git#7bb02943d6d657b7d766d186945b5486a99fb39a" [[package]] name = "bitflags" -version = "0.1.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cookie" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -41,41 +56,69 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gcc" -version = "0.3.5" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "hpack" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "httparse" -version = "0.1.2" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.4.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cookie 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", - "httparse 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", + "httparse 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "language-tags 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.0.11 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "traitobject 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "typeable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.0.12 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "solicit 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.31 (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 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "kernel32-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "language-tags" +version = "0.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "lazy_static" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -85,10 +128,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libressl-pnacl-sys" -version = "2.1.5" +version = "2.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "pnacl-build-helper 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnacl-build-helper 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -104,9 +147,17 @@ name = "matches" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "memchr" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "mime" -version = "0.0.11" +version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -132,7 +183,7 @@ dependencies = [ [[package]] name = "num_cpus" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -140,34 +191,34 @@ dependencies = [ [[package]] name = "openssl" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libressl-pnacl-sys 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pkg-config" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "pnacl-build-helper" -version = "1.4.0" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -183,14 +234,33 @@ dependencies = [ [[package]] name = "regex" -version = "0.1.30" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "aho-corasick 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex-syntax" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc-serialize" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "solicit" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "tempdir" version = "0.3.4" @@ -201,21 +271,22 @@ dependencies = [ [[package]] name = "time" -version = "0.1.25" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "traitobject" -version = "0.0.3" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "typeable" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -225,11 +296,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "url" -version = "0.2.34" +version = "0.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -238,18 +309,28 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "webdriver" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "winapi" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi-build" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + diff --git a/testing/geckodriver/Cargo.toml b/testing/geckodriver/Cargo.toml index e3da21516de4..87db2e0ea6f0 100644 --- a/testing/geckodriver/Cargo.toml +++ b/testing/geckodriver/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wires" -version = "0.2.0" +version = "0.2.1" authors = ["James Graham "] description = "Proxy for using WebDriver clients to interact with Gecko-based browsers." repository = "https://github.com/jgraham/wires" @@ -8,9 +8,7 @@ license = "MPL-2.0" [dependencies] env_logger = "0.3.1" -hyper = "0.4.0" log = "0.3.1" -regex = "0.1.30" rustc-serialize = "0.3.14" uuid = "0.1.17" mozrunner = "0.1.0" diff --git a/testing/geckodriver/src/main.rs b/testing/geckodriver/src/main.rs index 02b783b712aa..ed1d178be6bf 100644 --- a/testing/geckodriver/src/main.rs +++ b/testing/geckodriver/src/main.rs @@ -3,10 +3,8 @@ extern crate log; extern crate rustc_serialize; extern crate argparse; extern crate env_logger; -extern crate hyper; extern crate mozprofile; extern crate mozrunner; -extern crate regex; #[macro_use] extern crate webdriver;