From 5cbd53fef25ee1006a1ef48864f0ed3d877a22ba Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Tue, 22 Dec 2015 18:05:13 +0100 Subject: [PATCH] Update dependencies, use git version of eventual. --- Cargo.lock | 171 +++++++++++++++++++++++++++-------------------------- Cargo.toml | 8 ++- src/lib.rs | 2 +- 3 files changed, 93 insertions(+), 88 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ab0435d..96dd156d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,21 +3,21 @@ name = "librespot" version = "0.1.0" dependencies = [ "bit-set 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "eventual 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "eventual 0.1.4 (git+https://github.com/carllerche/eventual.git)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "librespot-protocol 0.1.0", - "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", + "num 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "portaudio 0.1.2 (git+https://github.com/mvdnes/portaudio-rs)", - "protobuf 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf_macros 0.1.0 (git+https://github.com/plietar/rust-protobuf-macros.git)", - "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", - "rpassword 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rust-crypto 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "shannon 0.1.0 (git+https://github.com/plietar/rust-shannon.git)", - "tempfile 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", + "rpassword 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rust-crypto 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", + "shannon 0.1.1 (git+https://github.com/plietar/rust-shannon.git)", + "tempfile 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", "vergen 0.0.16 (registry+https://github.com/rust-lang/crates.io-index)", "vorbis 0.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -27,7 +27,7 @@ name = "advapi32-sys" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -46,36 +46,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bitflags" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "byteorder" -version = "0.3.13" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "eventual" version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/carllerche/eventual.git#43fdda25a0a275fec919bc449a159797362b28a2" dependencies = [ - "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "syncbox 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gcc" -version = "0.3.19" +version = "0.3.21" 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.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -88,7 +83,16 @@ name = "kernel32-sys" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -99,7 +103,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.1.10" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "libc" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -107,15 +116,15 @@ name = "librespot-protocol" version = "0.1.0" dependencies = [ "mod_path 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "log" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -125,10 +134,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "num" -version = "0.1.27" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -137,8 +146,8 @@ name = "ogg-sys" version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -150,25 +159,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "portaudio" version = "0.1.2" -source = "git+https://github.com/mvdnes/portaudio-rs#7c6d10f5edda0094cc33b682d88c3a6ea4919b9f" +source = "git+https://github.com/mvdnes/portaudio-rs#fe7c38fd61814c6426a41cd0b95c0b17e0130cd7" dependencies = [ - "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "portaudio_sys 0.1.0 (git+https://github.com/mvdnes/portaudio-rs)", + "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)", + "portaudio_sys 0.1.1 (git+https://github.com/mvdnes/portaudio-rs)", ] [[package]] name = "portaudio_sys" -version = "0.1.0" -source = "git+https://github.com/mvdnes/portaudio-rs#7c6d10f5edda0094cc33b682d88c3a6ea4919b9f" +version = "0.1.1" +source = "git+https://github.com/mvdnes/portaudio-rs#fe7c38fd61814c6426a41cd0b95c0b17e0130cd7" dependencies = [ - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "protobuf" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -178,40 +187,35 @@ source = "git+https://github.com/plietar/rust-protobuf-macros.git#4f4a16e3e643ca [[package]] name = "rand" -version = "0.3.11" +version = "0.3.12" 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)", - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "readall" -version = "0.1.0" -source = "git+https://github.com/plietar/rust-readall.git#d2bcc1de325705230e79ba444cde2f39b469f891" - [[package]] name = "rpassword" -version = "0.0.6" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "termios 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "termios 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rust-crypto" -version = "0.2.33" +version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -221,20 +225,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "shannon" -version = "0.1.0" -source = "git+https://github.com/plietar/rust-shannon.git#c6be8a879a523a77d81c50df46faa891b76fea25" +version = "0.1.1" +source = "git+https://github.com/plietar/rust-shannon.git#ed87ffd2cf09a2a99871900e81ecfaaac117b790" dependencies = [ - "byteorder 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "readall 0.1.0 (git+https://github.com/plietar/rust-readall.git)", + "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "shannon-sys 0.1.0 (git+https://github.com/plietar/rust-shannon.git)", ] [[package]] name = "shannon-sys" version = "0.1.0" -source = "git+https://github.com/plietar/rust-shannon.git#c6be8a879a523a77d81c50df46faa891b76fea25" +source = "git+https://github.com/plietar/rust-shannon.git#ed87ffd2cf09a2a99871900e81ecfaaac117b790" dependencies = [ - "gcc 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -242,37 +245,37 @@ name = "syncbox" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tempfile" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "termios" -version = "0.0.5" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "time" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -280,8 +283,8 @@ name = "vergen" version = "0.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -289,7 +292,7 @@ name = "vorbis" version = "0.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "vorbis-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "vorbisfile-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -300,8 +303,8 @@ name = "vorbis-sys" version = "0.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -311,8 +314,8 @@ name = "vorbisfile-sys" version = "0.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "vorbis-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -320,7 +323,7 @@ dependencies = [ [[package]] name = "winapi" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] diff --git a/Cargo.toml b/Cargo.toml index 987944e4..e3a4b6e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,14 +17,14 @@ path = "protocol" [dependencies] bit-set = "~0.2.0" -byteorder = "~0.3.13" -eventual = "~0.1.4" +byteorder = "~0.4.2" +#eventual = "~0.1.4" getopts = "~0.2.14" lazy_static = "~0.1.14" num = "~0.1.27" protobuf = "~1.0.4" rand = "~0.3.11" -rpassword = "~0.0.5" +rpassword = "~0.1.0" rust-crypto = "~0.2.31" time = "~0.1.32" tempfile = "~1.1.1" @@ -36,6 +36,8 @@ git = "https://github.com/plietar/rust-protobuf-macros.git" git = "https://github.com/plietar/rust-shannon.git" [dependencies.portaudio] git = "https://github.com/mvdnes/portaudio-rs" +[dependencies.eventual] +git = "https://github.com/carllerche/eventual.git" [build-dependencies] vergen = "~0.0.16" diff --git a/src/lib.rs b/src/lib.rs index bcf893cd..9608e7d3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,6 @@ #![crate_name = "librespot"] -#![feature(plugin,read_exact,zero_one,iter_arith,slice_bytes,mpsc_select)] +#![feature(plugin,zero_one,iter_arith,slice_bytes,mpsc_select)] #![plugin(protobuf_macros)] #[macro_use] extern crate lazy_static;