From c0709171b44f39ac2c9d64544795b5e9cbd9303b Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Fri, 22 Apr 2016 13:53:50 +0200 Subject: [PATCH] Fix `cargo update` error when compiling ws --- Cargo.lock | 110 ++++++++++++++++++++++++++++++++++------------------- Cargo.toml | 2 +- 2 files changed, 71 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 060c83a8..7ffdcbff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,7 +2,7 @@ name = "foxbox" version = "0.1.0" dependencies = [ - "chrono 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "clippy 0.0.63 (registry+https://github.com/rust-lang/crates.io-index)", "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)", "docopt_macros 0.6.83 (registry+https://github.com/rust-lang/crates.io-index)", @@ -26,7 +26,7 @@ dependencies = [ "openssl-sys 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", "openzwave-adapter 0.1.0", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.66 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.65 (registry+https://github.com/rust-lang/crates.io-index)", "router 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rusqlite 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -43,7 +43,7 @@ dependencies = [ "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)", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "ws 0.4.5 (git+https://github.com/housleyjk/ws-rs.git?rev=d154fc5)", + "ws 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -109,7 +109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "chrono" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -138,13 +138,13 @@ dependencies = [ [[package]] name = "cookie" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "openssl 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (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)", ] [[package]] @@ -160,7 +160,7 @@ name = "docopt" version = "0.6.80" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "regex 0.1.66 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.65 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -179,7 +179,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.66 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -195,7 +195,7 @@ dependencies = [ name = "foxbox_taxonomy" version = "0.1.2" dependencies = [ - "chrono 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "clippy 0.0.63 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -213,7 +213,7 @@ dependencies = [ name = "foxbox_thinkerbell" version = "0.1.2" dependencies = [ - "chrono 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "foxbox_taxonomy 0.1.2", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rusqlite 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -304,7 +304,7 @@ name = "hyper" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cookie 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", @@ -319,6 +319,16 @@ dependencies = [ "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "idna" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "ip" version = "1.1.1" @@ -462,6 +472,11 @@ dependencies = [ "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "mempool" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "mime" version = "0.1.3" @@ -495,6 +510,22 @@ dependencies = [ "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "mio" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "miow 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "miow" version = "0.1.2" @@ -558,6 +589,15 @@ dependencies = [ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "nix" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "nix" version = "0.5.0-pre" @@ -660,7 +700,7 @@ dependencies = [ [[package]] name = "openzwave" version = "0.1.0" -source = "git+https://github.com/fxbox/openzwave-rust#3fdf6ee82161b786b54fddaea53d5a96a3913488" +source = "git+https://github.com/fxbox/openzwave-rust#b11bbcb9f38ed4f5534b990617fd3dabbc3936d2" dependencies = [ "itertools 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -688,7 +728,7 @@ dependencies = [ [[package]] name = "openzwave-sys" version = "0.1.0" -source = "git+https://github.com/fxbox/openzwave-rust#3fdf6ee82161b786b54fddaea53d5a96a3913488" +source = "git+https://github.com/fxbox/openzwave-rust#b11bbcb9f38ed4f5534b990617fd3dabbc3936d2" dependencies = [ "gcc 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -783,13 +823,13 @@ dependencies = [ [[package]] name = "regex" -version = "0.1.66" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "aho-corasick 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mempool 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -975,24 +1015,6 @@ dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "thread-id" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "thread_local" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "time" version = "0.1.35" @@ -1008,7 +1030,7 @@ name = "timer" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "chrono 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1103,7 +1125,16 @@ dependencies = [ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "url" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1142,7 +1173,7 @@ dependencies = [ [[package]] name = "uuid" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1165,15 +1196,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ws" -version = "0.4.5" -source = "git+https://github.com/housleyjk/ws-rs.git?rev=d154fc5#d154fc56e8dd06d9172efd08ef0db9c244668cbf" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.5.0 (git+https://github.com/carllerche/mio.git)", + "mio 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/Cargo.toml b/Cargo.toml index cc906075..512e75cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ time = "0.1" timer = "0.1.6" uuid = "0.1.18" url = "0.5.7" -ws = { git = "https://github.com/housleyjk/ws-rs.git", rev = "d154fc5" } +ws = "0.4.6" xml-rs = "0.3.0" [dependencies.iron]