mirror of
https://github.com/OMGeeky/yup-oauth2.git
synced 2026-01-24 10:50:24 +01:00
Merge pull request #54 from Byron/master
Prepare for proc_macros and serde-derive
This commit is contained in:
Sebastian Thiel
GitHub
@@ -1 +0,0 @@
|
||||
rustc 1.10.0-nightly (0667ae93f 2016-05-17)
|
||||
13
.travis.yml
13
.travis.yml
@@ -5,18 +5,10 @@ os:
|
||||
rust:
|
||||
- stable
|
||||
- nightly
|
||||
matrix:
|
||||
exclude:
|
||||
- rust: stable
|
||||
env: FEATURE=nightly
|
||||
allow_failures:
|
||||
- os: osx
|
||||
- rust: nightly
|
||||
env: FEATURE=nightly
|
||||
before_script:
|
||||
- pip install 'travis-cargo<0.2' --user && export PATH=$HOME/Library/Python/2.7/bin:$HOME/.local/bin:$PATH
|
||||
script:
|
||||
- travis-cargo test -- --features $FEATURE --no-default-features
|
||||
- travis-cargo test
|
||||
- travis-cargo build -- --manifest-path examples/drive_example/Cargo.toml
|
||||
- travis-cargo build -- --manifest-path examples/service_account/Cargo.toml
|
||||
after_success:
|
||||
@@ -24,6 +16,3 @@ after_success:
|
||||
env:
|
||||
global:
|
||||
- TRAVIS_CARGO_NIGHTLY_FEATURE=""
|
||||
matrix:
|
||||
- FEATURE=with-serde-codegen
|
||||
- FEATURE=nightly
|
||||
|
||||
121
Cargo.lock
generated
121
Cargo.lock
generated
@@ -1,6 +1,6 @@
|
||||
[root]
|
||||
name = "yup-oauth2"
|
||||
version = "1.0.2"
|
||||
version = "1.0.3"
|
||||
dependencies = [
|
||||
"base64 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -10,10 +10,9 @@ dependencies = [
|
||||
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"openssl 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_codegen 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_json 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"url 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"yup-hyper-mock 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
@@ -39,7 +38,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "dtoa"
|
||||
version = "0.2.2"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
@@ -102,7 +101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "0.1.1"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
@@ -267,111 +266,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "0.8.23"
|
||||
version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "serde_codegen"
|
||||
version = "0.8.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"quote 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_codegen_internals 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syntex 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syntex_syntax 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_codegen_internals"
|
||||
version = "0.11.3"
|
||||
version = "0.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syn 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "0.8.23"
|
||||
version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"serde_codegen 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"quote 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_codegen_internals 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syn 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "0.8.6"
|
||||
version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"dtoa 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"itoa 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-traits 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "0.10.8"
|
||||
version = "0.11.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"quote 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syntex"
|
||||
version = "0.54.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"syntex_errors 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syntex_syntax 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syntex_errors"
|
||||
version = "0.54.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syntex_pos 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syntex_pos"
|
||||
version = "0.54.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syntex_syntax"
|
||||
version = "0.54.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syntex_errors 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"syntex_pos 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "term"
|
||||
version = "0.4.4"
|
||||
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)",
|
||||
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.1.36"
|
||||
@@ -485,7 +420,7 @@ dependencies = [
|
||||
"checksum base64 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2015e3793554aa5b6007e3a72959e84c1070039e74f13dde08fa64afe1ddd892"
|
||||
"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
|
||||
"checksum chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00"
|
||||
"checksum dtoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0dd841b58510c9618291ffa448da2e4e0f699d984d436122372f446dae62263d"
|
||||
"checksum dtoa 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5edd69c67b2f8e0911629b7e6b8a34cb3956613cd7c6e6414966dee349c2db4f"
|
||||
"checksum error-chain 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "318cb3c71ee4cdea69fdc9e15c173b245ed6063e1709029e8fd32525a881120f"
|
||||
"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
|
||||
"checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
|
||||
@@ -493,7 +428,7 @@ dependencies = [
|
||||
"checksum hyper 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c71c50dd1f51884e1619f03270f077a8a09af93efa74d1735fbfb75012184344"
|
||||
"checksum idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1053236e00ce4f668aeca4a769a09b3bf5a682d802abd6f3cb39374f6b162c11"
|
||||
"checksum itertools 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c4a9b56eb56058f43dc66e58f40a214b2ccbc9f3df51861b63d51dec7b65bc3f"
|
||||
"checksum itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3088ea4baeceb0284ee9eea42f591226e6beaecf65373e41b38d95a1b8e7a1"
|
||||
"checksum itoa 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91fd9dc2c587067de817fec4ad355e3818c3d893a78cab32a0a474c7a15bb8d5"
|
||||
"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.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6abe0ee2e758cd6bc8a2cd56726359007748fbf4128da998b65d0b70f881e19b"
|
||||
@@ -517,17 +452,11 @@ dependencies = [
|
||||
"checksum rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "237546c689f20bb44980270c73c3b9edd0891c1be49cc1274406134a66d3957b"
|
||||
"checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
|
||||
"checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
|
||||
"checksum serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
|
||||
"checksum serde_codegen 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c5d8a33087d8984f9535daa62a6498a08f6476050b00ab9339dd847e4c25cc"
|
||||
"checksum serde_codegen_internals 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "afad7924a009f859f380e4a2e3a509a845c2ac66435fcead74a4d983b21ae806"
|
||||
"checksum serde_derive 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "ce44e5f4264b39e9d29c875357b7cc3ebdfb967bb9e22bfb5e44ffa400af5306"
|
||||
"checksum serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "67f7d2e9edc3523a9c8ec8cd6ec481b3a27810aafee3e625d311febd3e656b4c"
|
||||
"checksum syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)" = "58fd09df59565db3399efbba34ba8a2fec1307511ebd245d0061ff9d42691673"
|
||||
"checksum syntex 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb3f52553a966675982404dc34028291b347e0c9a9c0b0b34f2da6be8a0443f8"
|
||||
"checksum syntex_errors 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dee2f6e49c075f71332bb775219d5982bee6732d26227fa1ae1b53cdb12f5cc5"
|
||||
"checksum syntex_pos 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8df3921c7945dfb9ffc53aa35adb2cf4313b5ab5f079c3619b3d4eb82a0efc2b"
|
||||
"checksum syntex_syntax 0.54.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc960085bae44591e22d01f6c0e82a8aec832f8659aca556cdf8ecbdac2bb47b"
|
||||
"checksum term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3deff8a2b3b6607d6d7cc32ac25c0b33709453ca9cceac006caac51e963cf94a"
|
||||
"checksum serde 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4d8f810025e9d09c4eaa49c16eaf878f34a947889e878cd7d3b5bef3197cc119"
|
||||
"checksum serde_codegen_internals 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d582c270e85145985a3e1f578c8e02ff5e3e509bae0377351bf0fcb78c60877f"
|
||||
"checksum serde_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb6eef50123f9d4d917f50cc06fc88642228ca3b19482691907d4d6e94b4fcd1"
|
||||
"checksum serde_json 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fea48f4d4df4e620e3c81fd2bf28c93dd0d266361a76bac4f254b71f0e13f3cd"
|
||||
"checksum syn 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f4f94368aae82bb29656c98443a7026ca931a659e8d19dcdc41d6e273054e820"
|
||||
"checksum time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "211b63c112206356ef1ff9b19355f43740fc3f85960c598a93d3a3d3ba7beade"
|
||||
"checksum toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4"
|
||||
"checksum traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "07eaeb7689bb7fca7ce15628319635758eda769fed481ecfe6686ddef2600616"
|
||||
|
||||
17
Cargo.toml
17
Cargo.toml
@@ -1,14 +1,13 @@
|
||||
[package]
|
||||
|
||||
name = "yup-oauth2"
|
||||
version = "1.0.3"
|
||||
version = "1.0.4"
|
||||
authors = ["Sebastian Thiel <byronimo@gmail.com>", "Lewin Bormann <lbo@spheniscida.de>"]
|
||||
repository = "https://github.com/dermesser/yup-oauth2"
|
||||
description = "An oauth2 implementation, providing the 'device', 'service account' and 'installed' authorization flows"
|
||||
documentation = "https://docs.rs/yup-oauth2/"
|
||||
keywords = ["google", "oauth", "v2"]
|
||||
license = "MIT OR Apache-2.0"
|
||||
build = "src/build.rs"
|
||||
|
||||
[dependencies]
|
||||
base64 = "0.2"
|
||||
@@ -17,19 +16,11 @@ hyper = "0.10.2"
|
||||
itertools = "0.4"
|
||||
log = "0.3"
|
||||
openssl = "0.9.6"
|
||||
serde = "0.8"
|
||||
serde_json = "0.8"
|
||||
serde_derive = { version = "0.8", optional = true }
|
||||
serde = "0.9"
|
||||
serde_json = "0.9"
|
||||
serde_derive = "0.9"
|
||||
url = "0.5"
|
||||
|
||||
[features]
|
||||
default = ["with-serde-codegen"]
|
||||
nightly = ["serde_derive"]
|
||||
with-serde-codegen = ["serde_codegen"]
|
||||
|
||||
[build-dependencies]
|
||||
serde_codegen = { version = "^ 0.8", optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
getopts = "0.2"
|
||||
open = "1.1"
|
||||
|
||||
11
Makefile
11
Makefile
@@ -1,11 +0,0 @@
|
||||
.PHONY = nightly
|
||||
|
||||
help:
|
||||
$(info -- Targets -- )
|
||||
$(info )
|
||||
$(info nightly - run cargo with nightly configuration, set ARGS to something like 'build'. rustc must be set to nightly)
|
||||
$(info _____________Note that for using stable, you can use cargo directly)
|
||||
$(info )
|
||||
|
||||
nightly:
|
||||
cargo $(ARGS) --no-default-features --features=nightly
|
||||
31
changelog.md
31
changelog.md
@@ -1,3 +1,34 @@
|
||||
<a name=""></a>
|
||||
## v1.0.4 (2017-02-03)
|
||||
|
||||
|
||||
#### Improvements
|
||||
|
||||
* **serde:** use proc_macros and serde-derive ([59584b24](https://github.com/Byron/yup-oauth2/commit/59584b240e7d9dfa8d412fa5524d2420037373d1))
|
||||
|
||||
|
||||
|
||||
<a name=""></a>
|
||||
## v1.0.3 (2017-02-03)
|
||||
|
||||
|
||||
#### Bug Fixes
|
||||
|
||||
* **deps:** Fix dependency problems and openssl test failure. ([567ff12c](https://github.com/Byron/yup-oauth2/commit/567ff12cd4590683cc7f1e5e673d68dd1ae1a129))
|
||||
* **openssl:** Update to 0.9.x ([fe0a094b](https://github.com/Byron/yup-oauth2/commit/fe0a094b4563ff66e67f86b1ad042b80e76eafed))
|
||||
|
||||
|
||||
<a name=""></a>
|
||||
## v1.0.1 (2017-02-03)
|
||||
|
||||
|
||||
#### Bug Fixes
|
||||
|
||||
* **serde:** use serde_derive ([11baf2f7](https://github.com/Byron/yup-oauth2/commit/11baf2f7121973f5d466abdfc0842f5f53ad389f))
|
||||
* **travis-key:** Fix typo in previous API key ([eaca1f22](https://github.com/Byron/yup-oauth2/commit/eaca1f2283fbe81157dd4321df1af340e67f0e91))
|
||||
|
||||
|
||||
|
||||
<a name="v1.0.0"></a>
|
||||
### v1.0.0 (2016-10-09)
|
||||
|
||||
|
||||
26
src/build.rs
26
src/build.rs
@@ -1,26 +0,0 @@
|
||||
#[cfg(feature = "with-serde-codegen")]
|
||||
mod inner {
|
||||
extern crate serde_codegen;
|
||||
|
||||
use std::env;
|
||||
use std::path::Path;
|
||||
|
||||
pub fn main() {
|
||||
let out_dir = env::var_os("OUT_DIR").unwrap();
|
||||
|
||||
let src = Path::new("src/lib.rs.in");
|
||||
let dst = Path::new(&out_dir).join("lib.rs");
|
||||
|
||||
serde_codegen::expand(&src, &dst).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "with-serde-codegen"))]
|
||||
mod inner {
|
||||
pub fn main() {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn main() {
|
||||
inner::main()
|
||||
}
|
||||
43
src/lib.rs
43
src/lib.rs
@@ -35,8 +35,6 @@
|
||||
//! authorize future API requests to the same scopes.
|
||||
//!
|
||||
//! ```test_harness,no_run
|
||||
//! #![cfg_attr(feature = "nightly", feature(proc_macro))]
|
||||
//! #[cfg(feature = "nightly")]
|
||||
//! #[macro_use]
|
||||
//! extern crate serde_derive;
|
||||
//!
|
||||
@@ -67,10 +65,41 @@
|
||||
//! # }
|
||||
//! ```
|
||||
//!
|
||||
#![cfg_attr(feature = "nightly", feature(proc_macro))]
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
#[cfg(feature = "nightly")]
|
||||
include!("lib.rs.in");
|
||||
extern crate serde;
|
||||
extern crate serde_json;
|
||||
|
||||
extern crate base64;
|
||||
extern crate chrono;
|
||||
extern crate openssl;
|
||||
extern crate hyper;
|
||||
#[cfg(test)]
|
||||
extern crate log;
|
||||
#[cfg(test)]
|
||||
extern crate yup_hyper_mock;
|
||||
extern crate url;
|
||||
extern crate itertools;
|
||||
|
||||
mod authenticator;
|
||||
mod authenticator_delegate;
|
||||
mod device;
|
||||
mod helper;
|
||||
mod installed;
|
||||
mod refresh;
|
||||
mod service_account;
|
||||
mod storage;
|
||||
mod types;
|
||||
|
||||
pub use device::{GOOGLE_DEVICE_CODE_URL, DeviceFlow};
|
||||
pub use refresh::{RefreshFlow, RefreshResult};
|
||||
pub use types::{Token, FlowType, ApplicationSecret, ConsoleApplicationSecret, Scheme, TokenType};
|
||||
pub use installed::{InstalledFlow, InstalledFlowReturnMethod};
|
||||
pub use storage::{TokenStorage, NullStorage, MemoryStorage, DiskTokenStorage};
|
||||
pub use authenticator::{Authenticator, Retry, GetToken};
|
||||
pub use authenticator_delegate::{AuthenticatorDelegate, DefaultAuthenticatorDelegate, PollError,
|
||||
PollInformation};
|
||||
pub use helper::*;
|
||||
pub use service_account::*;
|
||||
|
||||
#[cfg(feature = "with-serde-codegen")]
|
||||
include!(concat!(env!("OUT_DIR"), "/lib.rs"));
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
#[cfg(feature = "nightly")]
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
extern crate serde;
|
||||
extern crate serde_json;
|
||||
|
||||
extern crate base64;
|
||||
extern crate chrono;
|
||||
extern crate openssl;
|
||||
extern crate hyper;
|
||||
#[cfg(test)]
|
||||
extern crate log;
|
||||
#[cfg(test)]
|
||||
extern crate yup_hyper_mock;
|
||||
extern crate url;
|
||||
extern crate itertools;
|
||||
|
||||
mod authenticator;
|
||||
mod authenticator_delegate;
|
||||
mod device;
|
||||
mod helper;
|
||||
mod installed;
|
||||
mod refresh;
|
||||
mod service_account;
|
||||
mod storage;
|
||||
mod types;
|
||||
|
||||
pub use device::{GOOGLE_DEVICE_CODE_URL, DeviceFlow};
|
||||
pub use refresh::{RefreshFlow, RefreshResult};
|
||||
pub use types::{Token, FlowType, ApplicationSecret, ConsoleApplicationSecret, Scheme, TokenType};
|
||||
pub use installed::{InstalledFlow, InstalledFlowReturnMethod};
|
||||
pub use storage::{TokenStorage, NullStorage, MemoryStorage, DiskTokenStorage};
|
||||
pub use authenticator::{Authenticator, Retry, GetToken};
|
||||
pub use authenticator_delegate::{AuthenticatorDelegate, DefaultAuthenticatorDelegate, PollError,
|
||||
PollInformation};
|
||||
pub use helper::*;
|
||||
pub use service_account::*;
|
||||
Reference in New Issue
Block a user