diff --git a/Cargo.lock b/Cargo.lock index 6bc9a63f136..e78a71db13a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,29 +3,29 @@ name = "cargo" version = "0.1.0" dependencies = [ "advapi32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "curl 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "curl 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "docopt 0.6.57 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "git2 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "git2-curl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git)", "kernel32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "registry 0.1.0", - "rustc-serialize 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", + "semver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "threadpool 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "threadpool 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -44,23 +44,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "curl" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "curl-sys 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "curl-sys 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "curl-sys" -version = "0.1.18" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -69,9 +69,9 @@ name = "docopt" version = "0.6.57" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -80,15 +80,15 @@ version = "0.3.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)", - "regex 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "flate2" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -99,13 +99,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "git2" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libgit2-sys 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -113,15 +113,15 @@ name = "git2-curl" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "curl 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "curl 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "git2 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glob" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -139,18 +139,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libgit2-sys" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libssh2-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libssh2-sys 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -164,12 +164,12 @@ dependencies = [ [[package]] name = "libssh2-sys" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -186,7 +186,7 @@ name = "log" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -200,7 +200,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -209,16 +209,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -238,31 +238,31 @@ name = "rand" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "registry" version = "0.1.0" dependencies = [ - "curl 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "curl 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-serialize" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "semver" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -280,7 +280,7 @@ dependencies = [ [[package]] name = "term" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -289,16 +289,16 @@ dependencies = [ [[package]] name = "threadpool" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -306,16 +306,16 @@ name = "toml" version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-serialize 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "url" -version = "0.2.28" +version = "0.2.29" 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.11 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -323,6 +323,6 @@ name = "winapi" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/Cargo.toml b/Cargo.toml index 070a1623d84..990cc76729a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,24 +10,24 @@ name = "cargo" path = "src/cargo/lib.rs" [dependencies] -toml = "0.1.18" -semver = "0.1.16" -curl = "0.2.2" -tar = "0.2.3" -flate2 = "0.2.0" -git2 = "0.2.1" -git2-curl = "0.2.1" -glob = "0.2.2" -time = "0.1.19" -log = "0.3.0" -env_logger = "0.3" -docopt = "0.6.45" -url = "0.2.23" -rustc-serialize = "0.3.1" -term = "0.2" -regex = "0.1.18" -threadpool = "0.1.1" -libc = "0.1.2" +toml = "0.1.20" +semver = "0.1.18" +curl = "0.2.7" +tar = "0.2.9" +flate2 = "0.2.6" +git2 = "0.2.8" +git2-curl = "0.2.3" +glob = "0.2.9" +time = "0.1.24" +log = "0.3.1" +env_logger = "0.3.0" +docopt = "0.6.57" +url = "0.2.29" +rustc-serialize = "0.3.12" +term = "0.2.6" +regex = "0.1.26" +threadpool = "0.1.3" +libc = "0.1.5" registry = { path = "src/registry" } num_cpus = "0.1" diff --git a/src/registry/lib.rs b/src/registry/lib.rs index e8f4d51ab2b..dae2ad060b2 100644 --- a/src/registry/lib.rs +++ b/src/registry/lib.rs @@ -22,7 +22,7 @@ pub struct Registry { pub type Result = result::Result; -#[derive(PartialEq, Copy)] +#[derive(PartialEq, Copy, Clone)] pub enum Auth { Authorized, Unauthorized