From 042c1826bf1d11c10632d3548af17475e5082f9c Mon Sep 17 00:00:00 2001 From: PoiScript Date: Wed, 23 Aug 2017 14:39:49 +0800 Subject: [PATCH 1/5] Replace hyper with reqwest --- Cargo.lock | 586 +++++++++++++++++++++++++++-------- Cargo.toml | 3 +- examples/github.rs | 11 +- examples/google-installed.rs | 16 +- examples/google-web.rs | 14 +- examples/imgur.rs | 15 +- src/client/error.rs | 14 +- src/client/mod.rs | 20 +- src/lib.rs | 2 +- src/token/bearer.rs | 2 +- tests/auth_uri.rs | 12 +- 11 files changed, 499 insertions(+), 196 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8cfdf6c..2eb821d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,15 +3,19 @@ name = "inth-oauth2" version = "0.12.0" dependencies = [ "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.10.11 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper-native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "yup-hyper-mock 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "adler32" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "advapi32-sys" version = "0.2.0" @@ -21,19 +25,28 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "antidote" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "base64" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "base64" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bitflags" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "bitflags" version = "0.9.1" @@ -41,7 +54,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "byteorder" -version = "1.0.0" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "bytes" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cfg-if" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -49,9 +76,17 @@ name = "chrono" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "conv" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -60,7 +95,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -68,7 +103,7 @@ name = "core-foundation-sys" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -80,6 +115,11 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "custom_derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "dtoa" version = "0.4.1" @@ -91,19 +131,24 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "gcc" -version = "0.3.50" +name = "futures" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "gdi32-sys" -version = "0.2.0" +name = "futures-cpupool" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "gcc" +version = "0.3.53" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "httparse" version = "1.2.3" @@ -111,7 +156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hyper" -version = "0.10.11" +version = "0.10.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -119,33 +164,67 @@ dependencies = [ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "hyper-native-tls" -version = "0.2.3" +name = "hyper" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.10.11 (registry+https://github.com/rust-lang/crates.io-index)", - "native-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "httparse 1.2.3 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "hyper-tls" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "idna" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "iovec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -173,18 +252,49 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "libc" -version = "0.2.23" +name = "lazycell" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "libc" +version = "0.2.29" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "libflate" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "adler32 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "log" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "magenta" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "magenta-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "matches" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -196,81 +306,134 @@ dependencies = [ ] [[package]] -name = "native-tls" -version = "0.1.2" +name = "mime" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)", - "schannel 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "mio" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", + "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "miow" +version = "0.2.1" +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)", + "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "native-tls" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)", + "schannel 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "num" -version = "0.1.37" +name = "net2" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-integer 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "num-iter 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-integer" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-iter" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-integer 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-traits" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "num_cpus" -version = "1.5.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl" -version = "0.9.13" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "openssl-sys" -version = "0.9.13" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)", - "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "percent-encoding" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "pkg-config" version = "0.3.9" @@ -283,17 +446,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rand" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", + "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "redox_syscall" -version = "0.1.18" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "reqwest" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rustc_version" version = "0.1.7" @@ -302,9 +487,14 @@ dependencies = [ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "safemem" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "schannel" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -316,6 +506,11 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "scoped-tls" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "secur32-sys" version = "0.2.0" @@ -327,22 +522,22 @@ dependencies = [ [[package]] name = "security-framework" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "security-framework-sys" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -352,12 +547,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_derive" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -381,10 +576,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "serde_urlencoded" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "slab" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "smallvec" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "syn" version = "0.11.11" @@ -403,25 +619,91 @@ dependencies = [ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "take" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "tempdir" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "time" -version = "0.1.37" +version = "0.1.38" 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.23 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "tokio-core" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "tokio-io" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "tokio-proto" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", + "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "tokio-service" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "tokio-tls" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "traitobject" version = "0.1.0" @@ -437,20 +719,28 @@ name = "unicase" version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "version_check 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "unicase" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "unicode-bidi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "unicode-normalization" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -460,25 +750,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "url" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "user32-sys" -version = "0.2.0" +name = "vcpkg" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.8 (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 = "version_check" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -491,76 +778,117 @@ name = "winapi-build" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.8 (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 = "yup-hyper-mock" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hyper 0.10.11 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [metadata] +"checksum adler32 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6cbd0b9af8587c72beadc9f72d35b9fbb070982c9e6203e46e93f10df25f8f45" "checksum advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a" -"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" "checksum base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30e93c03064e7590d0466209155251b90c22e37fab1daf2771582598b5827557" +"checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9" +"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" -"checksum byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8" +"checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d" +"checksum bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d828f97b58cc5de3e40c421d0cf2132d6b2da4ee0e11b8632fa838f0f9333ad6" +"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" "checksum chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c20ebe0b2b08b0aeddba49c609fe7957ba2e33449882cb186a180bc60682fa9" +"checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67" "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d" "checksum crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e34988f7e069e0b2f3bfc064295161e489b2d4e04a2e4248fb94360cdf00b4ec" +"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90" "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d" -"checksum gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)" = "5f837c392f2ea61cb1576eac188653df828c861b7137d74ea4a5caa89621f9e6" -"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518" +"checksum futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4b63a4792d4f8f686defe3b39b92127fea6344de5d38202b2ee5a11bbbf29d6a" +"checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff" +"checksum gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)" = "e8310f7e9c890398b0e80e301c4f474e9918d2b27fca8f48486ca775fa9ffc5a" "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07" -"checksum hyper 0.10.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cb7031283266d12f2d4bf30b624bc2b2fd21bbcc00863c9928e87dc5e1699d2e" -"checksum hyper-native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "48fecce9e67dff46707980abb41f10eaa49cf0eded8dd0c26ae94b3ae5c3f705" -"checksum idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2233d4940b1f19f0418c158509cd7396b8d70a5db5705ce410914dc8fa603b37" +"checksum hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0f01e4a20f5dfa5278d7762b7bdb7cab96e24378b9eca3889fbd4b5e94dc7063" +"checksum hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "641abc3e3fcf0de41165595f801376e01106bca1fd876dda937730e477ca004c" +"checksum hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c81fa95203e2a6087242c38691a0210f23e9f3f8f944350bd676522132e2985" +"checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d" +"checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be" "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf" -"checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e" +"checksum lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b585b7a6811fb03aa10e74b278a0f00f8dd9b45dc681f148bb29fa5cb61859b" +"checksum libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264" +"checksum libflate 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "a2aa04ec0100812d31a5366130ff9e793291787bc31da845bede4a00ea329830" "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b" -"checksum matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1" +"checksum magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527" +"checksum magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40d014c7011ac470ae28e2f76a02bfea4a8480f73e701353b49ad7a8d75f4699" +"checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -"checksum native-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1e94a2fc65a44729fe969cc973da87c1052ae3f000b2cb33029f14aeb85550d5" -"checksum num 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "98b15ba84e910ea7a1973bccd3df7b31ae282bf9d8bd2897779950c9b8303d40" -"checksum num-integer 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "ef1a4bf6f9174aa5783a9b4cc892cacd11aebad6c69ad027a0b65c6ca5f8aa37" -"checksum num-iter 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d1891bd7b936f12349b7d1403761c8a0b85a18b148e9da4429d5d102c1a41e" -"checksum num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99" -"checksum num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e416ba127a4bb3ff398cb19546a8d0414f73352efe2857f4060d36f5fe5983a" -"checksum openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b34cd77cf91301fff3123fbd46b065c3b728b17a392835de34c397315dce5586" -"checksum openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e035022a50faa380bd7ccdbd184d946ce539ebdb0a358780de92a995882af97a" +"checksum mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "153f98dde2b135dece079e5478ee400ae1bab13afa52d66590eacfc40e912435" +"checksum mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "dbd91d3bfbceb13897065e97b2ef177a09a438cb33612b2d371bf568819a9313" +"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" +"checksum native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04b781c9134a954c84f0594b9ab3f5606abc516030388e8511887ef4c204a1e5" +"checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09" +"checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525" +"checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba" +"checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01" +"checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0" +"checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584" +"checksum openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "085aaedcc89a2fac1eb2bc19cd66f29d4ea99fec60f82a5f3a88a6be7dbd90b5" +"checksum openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7e3a9845a4c9fdb321931868aae5549e96bb7b979bf9af7de03603d74691b5f3" +"checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356" "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -"checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d" -"checksum redox_syscall 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "3041aeb6000db123d2c9c751433f526e1f404b23213bd733167ab770c3989b4d" +"checksum rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "eb250fd207a4729c976794d03db689c9be1d634ab5a1c9da9492a13d8fecbcdf" +"checksum redox_syscall 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)" = "8312fba776a49cf390b7b62f3135f9b294d8617f7a7592cfd0ac2492b658cd7b" +"checksum reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5866613d84e2a39c0479a960bf2d0eff1fbfc934f02cd42b5c08c1e1efc5b1fd" "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084" -"checksum schannel 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4e45ac5e9e4698c1c138d2972bedcd90b81fe1efeba805449d2bdd54512de5f9" +"checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f" +"checksum schannel 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "14a5f8491ae5fc8c51aded1f5806282a0218b4d69b1b76913a0559507e559b90" +"checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d" "checksum secur32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f412dfa83308d893101dd59c10d6fda8283465976c28c287c5c855bf8d216bc" -"checksum security-framework 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "42ddf098d78d0b64564b23ee6345d07573e7d10e52ad86875d89ddf5f8378a02" -"checksum security-framework-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "5bacdada57ea62022500c457c8571c17dfb5e6240b7c8eac5916ffa8c7138a55" +"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332" +"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead" "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" -"checksum serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c2f530d36fb84ec48fb7146936881f026cdbf4892028835fd9398475f82c1bb4" -"checksum serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "10552fad5500771f3902d0c5ba187c5881942b811b7ba0d8fbbfbf84d80806d3" +"checksum serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f7726f29ddf9731b17ff113c461e362c381d9d69433f79de4f3dd572488823e9" +"checksum serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cf823e706be268e73e7747b147aa31c8f633ab4ba31f115efb57e5047c3a76dd" "checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a" "checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b" +"checksum serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce0fd303af908732989354c6f02e05e2e6d597152870f2c6990efb0577137480" +"checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" +"checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +"checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6" -"checksum time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd7ccbf969a892bf83f1e441126968a07a3941c24ff522a26af9f9f4585d1a3" +"checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520" +"checksum tokio-core 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e85d419699ec4b71bfe35bbc25bb8771e52eff0471a7f75c853ad06e200b4f86" +"checksum tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ab83e7adb5677e42e405fa4ceff75659d93c4d7d7dd22f52fcec59ee9f02af" +"checksum tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389" +"checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" +"checksum tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d88e411cac1c87e405e4090be004493c5d8072a370661033b1a64ea205ec2e13" "checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" "checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -"checksum unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a6a2c4e3710edd365cd7e78383153ed739fa31af19f9172f72d3575060f5a43a" -"checksum unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e28fa37426fceeb5cf8f41ee273faa7c82c47dc8fba5853402841e665fcd86ff" +"checksum unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e01da42520092d0cd2d6ac3ae69eb21a22ad43ff195676b86f8c37f487d6b80" +"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +"checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -"checksum url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2ba3456fbe5c0098cb877cf08b92b76c3e18e0be9e47c35b487220d377d24e" -"checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47" -"checksum version_check 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2bb3950bf29e36796dea723df1747619dd331881aefef75b7cf1c58fdd738afe" +"checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27" +"checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b" +"checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum yup-hyper-mock 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b19be9a18db9400bac5717cafb85a5d97fe16c5796c63faf3ea73a3e3ec47fe" diff --git a/Cargo.toml b/Cargo.toml index 8454b83..23d3652 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,12 +13,11 @@ readme = "README.md" [dependencies] chrono = { version = "0.4", features = ["serde"] } -hyper = "0.10" serde = "1.0.8" serde_derive = "1.0.5" serde_json = "1.0.2" url = "1.1.0" +reqwest = "0.7.3" [dev-dependencies] -hyper-native-tls = "0.2" yup-hyper-mock = "2.0" diff --git a/examples/github.rs b/examples/github.rs index 9b36ca7..dd541e8 100644 --- a/examples/github.rs +++ b/examples/github.rs @@ -1,18 +1,13 @@ -extern crate hyper; -extern crate hyper_native_tls; +extern crate reqwest; extern crate inth_oauth2; use std::io; -use hyper_native_tls::NativeTlsClient; -use hyper::net::HttpsConnector; use inth_oauth2::Client; use inth_oauth2::provider::GitHub; fn main() { - let tls = NativeTlsClient::new().unwrap(); - let connector = HttpsConnector::new(tls); - let https = hyper::Client::with_connector(connector); + let http_client = reqwest::Client::new().unwrap(); let client = Client::new( GitHub, @@ -27,6 +22,6 @@ fn main() { let mut code = String::new(); io::stdin().read_line(&mut code).unwrap(); - let token = client.request_token(&https, code.trim()).unwrap(); + let token = client.request_token(&http_client, code.trim()).unwrap(); println!("{:?}", token); } diff --git a/examples/google-installed.rs b/examples/google-installed.rs index 30909d0..b930544 100644 --- a/examples/google-installed.rs +++ b/examples/google-installed.rs @@ -1,18 +1,13 @@ -extern crate hyper; -extern crate hyper_native_tls; +extern crate reqwest; extern crate inth_oauth2; use std::io; -use hyper_native_tls::NativeTlsClient; -use hyper::net::HttpsConnector; use inth_oauth2::Client; use inth_oauth2::provider::google::{Installed, REDIRECT_URI_OOB}; fn main() { - let tls = NativeTlsClient::new().unwrap(); - let connector = HttpsConnector::new(tls); - let https = hyper::Client::with_connector(connector); + let http_client = reqwest::Client::new().unwrap(); let client = Client::new( Installed, @@ -21,16 +16,17 @@ fn main() { Some(String::from(REDIRECT_URI_OOB)), ); - let auth_uri = client.auth_uri(Some("https://www.googleapis.com/auth/userinfo.email"), None) + let auth_uri = client + .auth_uri(Some("https://www.googleapis.com/auth/userinfo.email"), None) .unwrap(); println!("{}", auth_uri); let mut code = String::new(); io::stdin().read_line(&mut code).unwrap(); - let token = client.request_token(&https, code.trim()).unwrap(); + let token = client.request_token(&http_client, code.trim()).unwrap(); println!("{:?}", token); - let token = client.refresh_token(&https, token, None).unwrap(); + let token = client.refresh_token(&http_client, token, None).unwrap(); println!("{:?}", token); } diff --git a/examples/google-web.rs b/examples/google-web.rs index f7070a3..eb00211 100644 --- a/examples/google-web.rs +++ b/examples/google-web.rs @@ -1,18 +1,13 @@ -extern crate hyper; -extern crate hyper_native_tls; +extern crate reqwest; extern crate inth_oauth2; use std::io; -use hyper_native_tls::NativeTlsClient; -use hyper::net::HttpsConnector; use inth_oauth2::Client; use inth_oauth2::provider::google::Web; fn main() { - let tls = NativeTlsClient::new().unwrap(); - let connector = HttpsConnector::new(tls); - let https = hyper::Client::with_connector(connector); + let http_client = reqwest::Client::new().unwrap(); let client = Client::new( Web, @@ -21,13 +16,14 @@ fn main() { Some(String::from("https://cmcenroe.me/oauth2-paste/")), ); - let auth_uri = client.auth_uri(Some("https://www.googleapis.com/auth/userinfo.email"), None) + let auth_uri = client + .auth_uri(Some("https://www.googleapis.com/auth/userinfo.email"), None) .unwrap(); println!("{}", auth_uri); let mut code = String::new(); io::stdin().read_line(&mut code).unwrap(); - let token = client.request_token(&https, code.trim()).unwrap(); + let token = client.request_token(&http_client, code.trim()).unwrap(); println!("{:?}", token); } diff --git a/examples/imgur.rs b/examples/imgur.rs index 99042b0..e3af47b 100644 --- a/examples/imgur.rs +++ b/examples/imgur.rs @@ -1,24 +1,19 @@ -extern crate hyper; -extern crate hyper_native_tls; +extern crate reqwest; extern crate inth_oauth2; use std::io; -use hyper_native_tls::NativeTlsClient; -use hyper::net::HttpsConnector; use inth_oauth2::Client; use inth_oauth2::provider::Imgur; fn main() { - let tls = NativeTlsClient::new().unwrap(); - let connector = HttpsConnector::new(tls); - let https = hyper::Client::with_connector(connector); + let http_client = reqwest::Client::new().unwrap(); let client = Client::new( Imgur, String::from("505c8ca804230e0"), String::from("c898d8cf28404102752b2119a3a1c6aab49899c8"), - Some(String::from("https://cmcenroe.me/oauth2-paste/")) + Some(String::from("https://cmcenroe.me/oauth2-paste/")), ); let auth_uri = client.auth_uri(None, None).unwrap(); @@ -27,9 +22,9 @@ fn main() { let mut code = String::new(); io::stdin().read_line(&mut code).unwrap(); - let token = client.request_token(&https, code.trim()).unwrap(); + let token = client.request_token(&http_client, code.trim()).unwrap(); println!("{:?}", token); - let token = client.refresh_token(&https, token, None).unwrap(); + let token = client.refresh_token(&http_client, token, None).unwrap(); println!("{:?}", token); } diff --git a/src/client/error.rs b/src/client/error.rs index a2356c2..0fd7ac3 100644 --- a/src/client/error.rs +++ b/src/client/error.rs @@ -1,9 +1,9 @@ use std::error::Error; use std::{fmt, io}; -use hyper; use serde_json; use url; +use reqwest; use client::response::ParseError; use error::OAuth2Error; @@ -17,8 +17,8 @@ pub enum ClientError { /// URL error. Url(url::ParseError), - /// Hyper error. - Hyper(hyper::Error), + /// Reqwest error. + Reqwest(reqwest::Error), /// JSON error. Json(serde_json::Error), @@ -35,7 +35,7 @@ impl fmt::Display for ClientError { match *self { ClientError::Io(ref err) => write!(f, "{}", err), ClientError::Url(ref err) => write!(f, "{}", err), - ClientError::Hyper(ref err) => write!(f, "{}", err), + ClientError::Reqwest(ref err) => write!(f, "{}", err), ClientError::Json(ref err) => write!(f, "{}", err), ClientError::Parse(ref err) => write!(f, "{}", err), ClientError::OAuth2(ref err) => write!(f, "{}", err), @@ -48,7 +48,7 @@ impl Error for ClientError { match *self { ClientError::Io(ref err) => err.description(), ClientError::Url(ref err) => err.description(), - ClientError::Hyper(ref err) => err.description(), + ClientError::Reqwest(ref err) => err.description(), ClientError::Json(ref err) => err.description(), ClientError::Parse(ref err) => err.description(), ClientError::OAuth2(ref err) => err.description(), @@ -59,7 +59,7 @@ impl Error for ClientError { match *self { ClientError::Io(ref err) => Some(err), ClientError::Url(ref err) => Some(err), - ClientError::Hyper(ref err) => Some(err), + ClientError::Reqwest(ref err) => Some(err), ClientError::Json(ref err) => Some(err), ClientError::Parse(ref err) => Some(err), ClientError::OAuth2(ref err) => Some(err), @@ -79,7 +79,7 @@ macro_rules! impl_from { impl_from!(ClientError::Io, io::Error); impl_from!(ClientError::Url, url::ParseError); -impl_from!(ClientError::Hyper, hyper::Error); +impl_from!(ClientError::Reqwest, reqwest::Error); impl_from!(ClientError::Json, serde_json::Error); impl_from!(ClientError::Parse, ParseError); impl_from!(ClientError::OAuth2, OAuth2Error); diff --git a/src/client/mod.rs b/src/client/mod.rs index 5d3f04a..c2ab9d3 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -5,7 +5,7 @@ mod error; pub mod response; pub use self::error::ClientError; -use hyper::{self, header, mime}; +use reqwest::{self, header, mime}; use serde_json::{self, Value}; use url::Url; use url::form_urlencoded::Serializer; @@ -109,8 +109,8 @@ impl Client

{ fn post_token( &self, - http_client: &hyper::Client, - mut body: Serializer, + http_client: &reqwest::Client, + mut body: Serializer ) -> Result { if self.provider.credentials_in_body() { body.append_pair("client_id", &self.client_id); @@ -124,17 +124,17 @@ impl Client

{ } ); let accept_header = header::Accept(vec![ - header::qitem(mime::Mime(mime::TopLevel::Application, mime::SubLevel::Json, vec![])), + header::qitem(mime::APPLICATION_JSON), ]); let body = body.finish(); - let request = http_client.post(self.provider.token_uri()) + let mut response = http_client.post(self.provider.token_uri())? .header(auth_header) .header(accept_header) .header(header::ContentType::form_url_encoded()) - .body(&body); + .body(body) + .send()?; - let mut response = request.send()?; let json = serde_json::from_reader(&mut response)?; let error = OAuth2Error::from_response(&json); @@ -151,7 +151,7 @@ impl Client

{ /// See [RFC 6749, section 4.1.3](http://tools.ietf.org/html/rfc6749#section-4.1.3). pub fn request_token( &self, - http_client: &hyper::Client, + http_client: &reqwest::Client, code: &str, ) -> Result { let mut body = Serializer::new(String::new()); @@ -174,7 +174,7 @@ impl

Client

where P: Provider, P::Token: Token { /// See [RFC 6749, section 6](http://tools.ietf.org/html/rfc6749#section-6). pub fn refresh_token( &self, - http_client: &hyper::Client, + http_client: &reqwest::Client, token: P::Token, scope: Option<&str>, ) -> Result { @@ -194,7 +194,7 @@ impl

Client

where P: Provider, P::Token: Token { /// Ensures an access token is valid by refreshing it if necessary. pub fn ensure_token( &self, - http_client: &hyper::Client, + http_client: &reqwest::Client, token: P::Token, ) -> Result { if token.lifetime().expired() { diff --git a/src/lib.rs b/src/lib.rs index 7b47169..02ebf5a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -152,9 +152,9 @@ extern crate serde_derive; extern crate chrono; -extern crate hyper; extern crate serde_json; extern crate url; +extern crate reqwest; pub mod token; pub mod provider; diff --git a/src/token/bearer.rs b/src/token/bearer.rs index ded32aa..3f7f1f0 100644 --- a/src/token/bearer.rs +++ b/src/token/bearer.rs @@ -1,4 +1,4 @@ -use hyper::header; +use reqwest::header; use serde_json::Value; use client::response::{FromResponse, ParseError}; diff --git a/tests/auth_uri.rs b/tests/auth_uri.rs index 8035e30..e560574 100644 --- a/tests/auth_uri.rs +++ b/tests/auth_uri.rs @@ -1,20 +1,14 @@ -extern crate hyper; -extern crate hyper_native_tls; +extern crate reqwest; extern crate inth_oauth2; extern crate url; -use hyper::net::HttpsConnector; -use hyper_native_tls::NativeTlsClient; use inth_oauth2::Client; use inth_oauth2::provider::*; use url::Url; fn assert_get_uri_ok(uri: Url) { - let tls = NativeTlsClient::new().unwrap(); - let connector = HttpsConnector::new(tls); - let client = hyper::Client::with_connector(connector); - let response = client.get(uri).send().unwrap(); - assert_eq!(hyper::Ok, response.status); + let response = reqwest::get(uri).unwrap(); + assert_eq!(reqwest::StatusCode::Ok, response.status()); } #[test] From aae91e1481bbdd46c360b9e6ce6dda441b606af8 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 23 Aug 2017 15:27:52 -0400 Subject: [PATCH 2/5] Fix doctests for reqwest --- src/lib.rs | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 02ebf5a..1d03cce 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -55,9 +55,8 @@ //! ### Requesting an access token //! //! ```no_run -//! # extern crate hyper; -//! # extern crate hyper_native_tls; //! # extern crate inth_oauth2; +//! # extern crate reqwest; //! use std::io; //! use inth_oauth2::{Client, Token}; //! # use inth_oauth2::provider::google::Installed; @@ -67,11 +66,8 @@ //! let mut code = String::new(); //! io::stdin().read_line(&mut code).unwrap(); //! -//! let tls = hyper_native_tls::NativeTlsClient::new().unwrap(); -//! let connector = hyper::net::HttpsConnector::new(tls); -//! let https = hyper::Client::with_connector(connector); -//! -//! let token = client.request_token(&https, code.trim()).unwrap(); +//! let http = reqwest::Client::new().unwrap(); +//! let token = client.request_token(&http, code.trim()).unwrap(); //! println!("{}", token.access_token()); //! # } //! ``` @@ -79,24 +75,32 @@ //! ### Refreshing an access token //! //! ```no_run +//! # extern crate inth_oauth2; +//! # extern crate reqwest; //! # use inth_oauth2::Client; //! # use inth_oauth2::provider::google::Installed; +//! # fn main() { //! # let client = Client::new(Installed, String::new(), String::new(), None); -//! # let https = Default::default(); -//! # let token = client.request_token(&https, "").unwrap(); -//! let token = client.refresh_token(&https, token, None).unwrap(); +//! # let http = reqwest::Client::new().unwrap(); +//! # let token = client.request_token(&http, "").unwrap(); +//! let token = client.refresh_token(&http, token, None).unwrap(); +//! # } //! ``` //! //! ### Ensuring an access token is still valid //! //! ```no_run +//! # extern crate inth_oauth2; +//! # extern crate reqwest; //! # use inth_oauth2::Client; //! # use inth_oauth2::provider::google::Installed; +//! # fn main() { //! # let client = Client::new(Installed, String::new(), String::new(), None); -//! # let https = Default::default(); -//! # let mut token = client.request_token(&https, "").unwrap(); +//! # let http = reqwest::Client::new().unwrap(); +//! # let mut token = client.request_token(&http, "").unwrap(); //! // Refresh token only if it has expired. -//! token = client.ensure_token(&https, token).unwrap(); +//! token = client.ensure_token(&http, token).unwrap(); +//! # } //! ``` //! //! ### Using bearer access tokens @@ -104,18 +108,19 @@ //! Bearer tokens can be converted to Hyper headers. //! //! ```no_run -//! # extern crate hyper; //! # extern crate inth_oauth2; +//! # extern crate reqwest; //! # use inth_oauth2::Client; //! # use inth_oauth2::provider::google::Installed; -//! use hyper::header::Authorization; +//! use reqwest::header::Authorization; //! //! # fn main() { //! # let oauth_client = Client::new(Installed, String::new(), String::new(), None); -//! # let https = Default::default(); -//! # let token = oauth_client.request_token(&https, "").unwrap(); -//! let request = https.get("https://example.com/resource") -//! .header(Into::>::into(&token)); +//! # let http = reqwest::Client::new().unwrap(); +//! # let token = oauth_client.request_token(&http, "").unwrap(); +//! let request = http.get("https://example.com/resource").unwrap() +//! .header(Into::>::into(&token)) +//! .build(); //! # } //! ``` //! @@ -125,13 +130,14 @@ //! //! ```no_run //! # extern crate inth_oauth2; +//! # extern crate reqwest; //! extern crate serde_json; //! # use inth_oauth2::Client; //! # use inth_oauth2::provider::google::Installed; //! # fn main() { -//! # let http_client = Default::default(); +//! # let http = reqwest::Client::new().unwrap(); //! # let client = Client::new(Installed, String::new(), String::new(), None); -//! # let token = client.request_token(&http_client, "").unwrap(); +//! # let token = client.request_token(&http, "").unwrap(); //! let json = serde_json::to_string(&token).unwrap(); //! # } //! ``` From ae94fb2169cbe544257fd524b57b718f32ee8556 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 23 Aug 2017 15:43:21 -0400 Subject: [PATCH 3/5] Remove mock tests --- tests/mock.rs | 191 ------------------ tests/response/invalid_request.http | 10 - tests/response/refresh_token_bearer_full.http | 12 -- .../refresh_token_bearer_partial.http | 11 - .../request_token_bearer_expiring.http | 11 - .../request_token_bearer_refresh.http | 12 -- .../response/request_token_bearer_static.http | 10 - 7 files changed, 257 deletions(-) delete mode 100644 tests/mock.rs delete mode 100644 tests/response/invalid_request.http delete mode 100644 tests/response/refresh_token_bearer_full.http delete mode 100644 tests/response/refresh_token_bearer_partial.http delete mode 100644 tests/response/request_token_bearer_expiring.http delete mode 100644 tests/response/request_token_bearer_refresh.http delete mode 100644 tests/response/request_token_bearer_static.http diff --git a/tests/mock.rs b/tests/mock.rs deleted file mode 100644 index 0122c74..0000000 --- a/tests/mock.rs +++ /dev/null @@ -1,191 +0,0 @@ -extern crate chrono; -extern crate hyper; -extern crate inth_oauth2; -#[macro_use] -extern crate yup_hyper_mock; - -use chrono::{Utc, Duration}; -use inth_oauth2::{Client, ClientError, Token, Lifetime}; -use inth_oauth2::error::OAuth2ErrorCode; - -mod provider { - use inth_oauth2::token::{Bearer, Static, Expiring, Refresh}; - use inth_oauth2::provider::Provider; - - pub struct BearerStatic; - impl Provider for BearerStatic { - type Lifetime = Static; - type Token = Bearer; - fn auth_uri(&self) -> &str { "https://example.com/oauth/auth" } - fn token_uri(&self) -> &str { "https://example.com/oauth/token" } - } - - pub struct BearerExpiring; - impl Provider for BearerExpiring { - type Lifetime = Expiring; - type Token = Bearer; - fn auth_uri(&self) -> &str { "https://example.com/oauth/auth" } - fn token_uri(&self) -> &str { "https://example.com/oauth/token" } - } - - pub struct BearerRefresh; - impl Provider for BearerRefresh { - type Lifetime = Refresh; - type Token = Bearer; - fn auth_uri(&self) -> &str { "https://example.com/oauth/auth" } - fn token_uri(&self) -> &str { "https://example.com/oauth/token" } - } -} - -mod connector { - use hyper; - - mock_connector_in_order!(BearerStatic { - include_str!("response/request_token_bearer_static.http") - }); - - mock_connector_in_order!(BearerExpiring { - include_str!("response/request_token_bearer_expiring.http") - }); - - mock_connector_in_order!(BearerRefresh { - include_str!("response/request_token_bearer_refresh.http") - include_str!("response/refresh_token_bearer_full.http") - }); - - mock_connector_in_order!(BearerRefreshPartial { - include_str!("response/request_token_bearer_refresh.http") - include_str!("response/refresh_token_bearer_partial.http") - }); - - mock_connector_in_order!(InvalidRequest { - include_str!("response/invalid_request.http") - }); - - mock_connector_in_order!(RefreshInvalidRequest { - include_str!("response/request_token_bearer_refresh.http") - include_str!("response/invalid_request.http") - }); -} - -macro_rules! mock_client { - ($p:path, $c:ty) => { - (Client::new( - $p, - String::from("client_id"), - String::from("client_secret"), - None, - ), - hyper::Client::with_connector(<$c>::default())) - } -} - - -#[test] -fn request_token_bearer_static_success() { - let (client, http_client) = mock_client!(provider::BearerStatic, connector::BearerStatic); - let token = client.request_token(&http_client, "code").unwrap(); - assert_eq!("aaaaaaaa", token.access_token()); - assert_eq!(Some("example"), token.scope()); -} - -#[test] -fn request_token_bearer_expiring_success() { - let (client, http_client) = mock_client!(provider::BearerExpiring, connector::BearerExpiring); - let token = client.request_token(&http_client, "code").unwrap(); - assert_eq!("aaaaaaaa", token.access_token()); - assert_eq!(Some("example"), token.scope()); - assert_eq!(false, token.lifetime().expired()); - assert!(token.lifetime().expires() > &Utc::now()); - assert!(token.lifetime().expires() <= &(Utc::now() + Duration::seconds(3600))); -} - -#[test] -fn request_token_bearer_refresh_success() { - let (client, http_client) = mock_client!(provider::BearerRefresh, connector::BearerRefresh); - let token = client.request_token(&http_client, "code").unwrap(); - assert_eq!("aaaaaaaa", token.access_token()); - assert_eq!(Some("example"), token.scope()); - assert_eq!("bbbbbbbb", token.lifetime().refresh_token()); - assert_eq!(false, token.lifetime().expired()); - assert!(token.lifetime().expires() > &Utc::now()); - assert!(token.lifetime().expires() <= &(Utc::now() + Duration::seconds(3600))); -} - -#[test] -fn refresh_token_bearer_full() { - let (client, http_client) = mock_client!(provider::BearerRefresh, connector::BearerRefresh); - let token = client.request_token(&http_client, "code").unwrap(); - let token = client.refresh_token(&http_client, token, None).unwrap(); - assert_eq!("cccccccc", token.access_token()); - assert_eq!(Some("example"), token.scope()); - assert_eq!("dddddddd", token.lifetime().refresh_token()); - assert_eq!(false, token.lifetime().expired()); - assert!(token.lifetime().expires() > &Utc::now()); - assert!(token.lifetime().expires() <= &(Utc::now() + Duration::seconds(3600))); -} - -#[test] -fn refresh_token_bearer_partial() { - let (client, http_client) = mock_client!(provider::BearerRefresh, connector::BearerRefreshPartial); - let token = client.request_token(&http_client, "code").unwrap(); - let token = client.refresh_token(&http_client, token, None).unwrap(); - assert_eq!("cccccccc", token.access_token()); - assert_eq!(Some("example"), token.scope()); - assert_eq!("bbbbbbbb", token.lifetime().refresh_token()); - assert_eq!(false, token.lifetime().expired()); - assert!(token.lifetime().expires() > &Utc::now()); - assert!(token.lifetime().expires() <= &(Utc::now() + Duration::seconds(3600))); -} - -#[test] -fn request_token_bearer_static_wrong_lifetime() { - let (client, http_client) = mock_client!(provider::BearerStatic, connector::BearerRefresh); - let err = client.request_token(&http_client, "code").unwrap_err(); - assert!(match err { ClientError::Parse(..) => true, _ => false }); -} - -#[test] -fn request_token_bearer_expiring_wrong_lifetime() { - let (client, http_client) = mock_client!(provider::BearerExpiring, connector::BearerRefresh); - let err = client.request_token(&http_client, "code").unwrap_err(); - assert!(match err { ClientError::Parse(..) => true, _ => false }); -} - -#[test] -fn request_token_bearer_refresh_wrong_lifetime() { - let (client, http_client) = mock_client!(provider::BearerRefresh, connector::BearerStatic); - let err = client.request_token(&http_client, "code").unwrap_err(); - assert!(match err { ClientError::Parse(..) => true, _ => false }); -} - -#[test] -fn request_token_invalid_request() { - let (client, http_client) = mock_client!(provider::BearerStatic, connector::InvalidRequest); - let err = client.request_token(&http_client, "code").unwrap_err(); - assert!(match err { - ClientError::OAuth2(err) => { - assert_eq!(OAuth2ErrorCode::InvalidRequest, err.code); - assert_eq!("example", err.description.unwrap()); - assert_eq!("https://example.com/error", err.uri.unwrap()); - true - }, - _ => false, - }); -} - -#[test] -fn refresh_token_invalid_request() { - let (client, http_client) = mock_client!(provider::BearerRefresh, connector::RefreshInvalidRequest); - let token = client.request_token(&http_client, "code").unwrap(); - let err = client.refresh_token(&http_client, token, None).unwrap_err(); - assert!(match err { - ClientError::OAuth2(err) => { - assert_eq!(OAuth2ErrorCode::InvalidRequest, err.code); - assert_eq!("example", err.description.unwrap()); - assert_eq!("https://example.com/error", err.uri.unwrap()); - true - }, - _ => false, - }); -} diff --git a/tests/response/invalid_request.http b/tests/response/invalid_request.http deleted file mode 100644 index e0b79d8..0000000 --- a/tests/response/invalid_request.http +++ /dev/null @@ -1,10 +0,0 @@ -HTTP/1.1 400 Bad Request -Content-Type: application/json;charset=UTF-8 -Cache-Control: no-store -Pragma: no-cache - -{ - "error":"invalid_request", - "error_description":"example", - "error_uri":"https://example.com/error" -} diff --git a/tests/response/refresh_token_bearer_full.http b/tests/response/refresh_token_bearer_full.http deleted file mode 100644 index 60cb0f2..0000000 --- a/tests/response/refresh_token_bearer_full.http +++ /dev/null @@ -1,12 +0,0 @@ -HTTP/1.1 200 OK -Content-Type: application/json;charset=UTF-8 -Cache-Control: no-store -Pragma: no-cache - -{ - "access_token":"cccccccc", - "token_type":"bearer", - "expires_in":3600, - "refresh_token":"dddddddd", - "scope":"example" -} diff --git a/tests/response/refresh_token_bearer_partial.http b/tests/response/refresh_token_bearer_partial.http deleted file mode 100644 index d88034a..0000000 --- a/tests/response/refresh_token_bearer_partial.http +++ /dev/null @@ -1,11 +0,0 @@ -HTTP/1.1 200 OK -Content-Type: application/json;charset=UTF-8 -Cache-Control: no-store -Pragma: no-cache - -{ - "access_token":"cccccccc", - "token_type":"bearer", - "expires_in":3600, - "scope":"example" -} diff --git a/tests/response/request_token_bearer_expiring.http b/tests/response/request_token_bearer_expiring.http deleted file mode 100644 index c715c22..0000000 --- a/tests/response/request_token_bearer_expiring.http +++ /dev/null @@ -1,11 +0,0 @@ -HTTP/1.1 200 OK -Content-Type: application/json;charset=UTF-8 -Cache-Control: no-store -Pragma: no-cache - -{ - "access_token":"aaaaaaaa", - "token_type":"bearer", - "expires_in":3600, - "scope":"example" -} diff --git a/tests/response/request_token_bearer_refresh.http b/tests/response/request_token_bearer_refresh.http deleted file mode 100644 index 8d00bfa..0000000 --- a/tests/response/request_token_bearer_refresh.http +++ /dev/null @@ -1,12 +0,0 @@ -HTTP/1.1 200 OK -Content-Type: application/json;charset=UTF-8 -Cache-Control: no-store -Pragma: no-cache - -{ - "access_token":"aaaaaaaa", - "token_type":"bearer", - "expires_in":3600, - "refresh_token":"bbbbbbbb", - "scope":"example" -} diff --git a/tests/response/request_token_bearer_static.http b/tests/response/request_token_bearer_static.http deleted file mode 100644 index fb6b08a..0000000 --- a/tests/response/request_token_bearer_static.http +++ /dev/null @@ -1,10 +0,0 @@ -HTTP/1.1 200 OK -Content-Type: application/json;charset=UTF-8 -Cache-Control: no-store -Pragma: no-cache - -{ - "access_token":"aaaaaaaa", - "token_type":"bearer", - "scope":"example" -} From 51cff673ba0c4de3f7cae5b0c9154072b073cbef Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 23 Aug 2017 15:54:25 -0400 Subject: [PATCH 4/5] Remove yup-hyper-mock dependency --- Cargo.lock | 75 ------------------------------------------------------ Cargo.toml | 3 --- 2 files changed, 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2eb821d..4c54de3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,6 @@ dependencies = [ "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "yup-hyper-mock 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -25,14 +24,6 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "base64" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "base64" version = "0.6.0" @@ -154,24 +145,6 @@ name = "httparse" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "hyper" -version = "0.10.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "httparse 1.2.3 (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.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", - "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "hyper" version = "0.11.2" @@ -297,14 +270,6 @@ name = "matches" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "mime" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mime" version = "0.3.3" @@ -704,24 +669,6 @@ dependencies = [ "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "typeable" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicase" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "unicase" version = "2.0.0" @@ -763,11 +710,6 @@ name = "vcpkg" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "version_check" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "winapi" version = "0.2.8" @@ -787,19 +729,9 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "yup-hyper-mock" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [metadata] "checksum adler32 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6cbd0b9af8587c72beadc9f72d35b9fbb070982c9e6203e46e93f10df25f8f45" "checksum advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a" -"checksum base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30e93c03064e7590d0466209155251b90c22e37fab1daf2771582598b5827557" "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9" "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" @@ -818,7 +750,6 @@ dependencies = [ "checksum futures-cpupool 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a283c84501e92cade5ea673a2a7ca44f71f209ccdd302a3e0896f50083d2c5ff" "checksum gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)" = "e8310f7e9c890398b0e80e301c4f474e9918d2b27fca8f48486ca775fa9ffc5a" "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07" -"checksum hyper 0.10.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0f01e4a20f5dfa5278d7762b7bdb7cab96e24378b9eca3889fbd4b5e94dc7063" "checksum hyper 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "641abc3e3fcf0de41165595f801376e01106bca1fd876dda937730e477ca004c" "checksum hyper-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c81fa95203e2a6087242c38691a0210f23e9f3f8f944350bd676522132e2985" "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d" @@ -834,7 +765,6 @@ dependencies = [ "checksum magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527" "checksum magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40d014c7011ac470ae28e2f76a02bfea4a8480f73e701353b49ad7a8d75f4699" "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" -"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" "checksum mime 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "153f98dde2b135dece079e5478ee400ae1bab13afa52d66590eacfc40e912435" "checksum mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "dbd91d3bfbceb13897065e97b2ef177a09a438cb33612b2d371bf568819a9313" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" @@ -878,17 +808,12 @@ dependencies = [ "checksum tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389" "checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" "checksum tokio-tls 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d88e411cac1c87e405e4090be004493c5d8072a370661033b1a64ea205ec2e13" -"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" -"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" -"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" "checksum unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e01da42520092d0cd2d6ac3ae69eb21a22ad43ff195676b86f8c37f487d6b80" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" "checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27" "checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b" -"checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -"checksum yup-hyper-mock 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b19be9a18db9400bac5717cafb85a5d97fe16c5796c63faf3ea73a3e3ec47fe" diff --git a/Cargo.toml b/Cargo.toml index 23d3652..0fdc618 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,3 @@ serde_derive = "1.0.5" serde_json = "1.0.2" url = "1.1.0" reqwest = "0.7.3" - -[dev-dependencies] -yup-hyper-mock = "2.0" From 466dbcf7b1253d884e38fe9a70c87af5e1774afd Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 23 Aug 2017 16:06:18 -0400 Subject: [PATCH 5/5] Sort imports --- src/client/error.rs | 2 +- src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/error.rs b/src/client/error.rs index 0fd7ac3..8e27f4a 100644 --- a/src/client/error.rs +++ b/src/client/error.rs @@ -1,9 +1,9 @@ use std::error::Error; use std::{fmt, io}; +use reqwest; use serde_json; use url; -use reqwest; use client::response::ParseError; use error::OAuth2Error; diff --git a/src/lib.rs b/src/lib.rs index 1d03cce..5c87366 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -158,9 +158,9 @@ extern crate serde_derive; extern crate chrono; +extern crate reqwest; extern crate serde_json; extern crate url; -extern crate reqwest; pub mod token; pub mod provider;