Commit
Author: Jason White [github@jasonwhite.io]
Hash: d28c9a9dac690807eba2504c761e80d9dc2b468b
Timestamp: Wed, 01 Jul 2020 03:48:54 +0000 (4 years ago)

+50 -11 +/-3 browse
Update structopt crate to v0.3
1diff --git a/Cargo.lock b/Cargo.lock
2index 56004f4..d2a8387 100644
3--- a/Cargo.lock
4+++ b/Cargo.lock
5 @@ -843,6 +843,30 @@ dependencies = [
6 ]
7
8 [[package]]
9+ name = "proc-macro-error"
10+ version = "1.0.3"
11+ source = "registry+https://github.com/rust-lang/crates.io-index"
12+ dependencies = [
13+ "proc-macro-error-attr 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
14+ "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
15+ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
16+ "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
17+ "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
18+ ]
19+
20+ [[package]]
21+ name = "proc-macro-error-attr"
22+ version = "1.0.3"
23+ source = "registry+https://github.com/rust-lang/crates.io-index"
24+ dependencies = [
25+ "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
26+ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
27+ "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
28+ "syn-mid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
29+ "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
30+ ]
31+
32+ [[package]]
33 name = "proc-macro2"
34 version = "0.4.30"
35 source = "registry+https://github.com/rust-lang/crates.io-index"
36 @@ -1064,7 +1088,7 @@ dependencies = [
37 "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
38 "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
39 "sha2 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
40- "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
41+ "structopt 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
42 "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
43 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
44 "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
45 @@ -1319,22 +1343,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
46
47 [[package]]
48 name = "structopt"
49- version = "0.2.18"
50+ version = "0.3.15"
51 source = "registry+https://github.com/rust-lang/crates.io-index"
52 dependencies = [
53 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
54- "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
55+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
56+ "structopt-derive 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
57 ]
58
59 [[package]]
60 name = "structopt-derive"
61- version = "0.2.18"
62+ version = "0.4.8"
63 source = "registry+https://github.com/rust-lang/crates.io-index"
64 dependencies = [
65 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
66- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
67- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
68- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
69+ "proc-macro-error 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
70+ "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
71+ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
72+ "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
73 ]
74
75 [[package]]
76 @@ -1358,6 +1384,16 @@ dependencies = [
77 ]
78
79 [[package]]
80+ name = "syn-mid"
81+ version = "0.5.0"
82+ source = "registry+https://github.com/rust-lang/crates.io-index"
83+ dependencies = [
84+ "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
85+ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
86+ "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
87+ ]
88+
89+ [[package]]
90 name = "termcolor"
91 version = "1.1.0"
92 source = "registry+https://github.com/rust-lang/crates.io-index"
93 @@ -1896,6 +1932,8 @@ dependencies = [
94 "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
95 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
96 "checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
97+ "checksum proc-macro-error 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
98+ "checksum proc-macro-error-attr 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
99 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
100 "checksum proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
101 "checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
102 @@ -1945,10 +1983,11 @@ dependencies = [
103 "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
104 "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
105 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
106- "checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7"
107- "checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107"
108+ "checksum structopt 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c"
109+ "checksum structopt-derive 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
110 "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
111 "checksum syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
112+ "checksum syn-mid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
113 "checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
114 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
115 "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
116 diff --git a/Cargo.toml b/Cargo.toml
117index 00e1393..66b8292 100644
118--- a/Cargo.toml
119+++ b/Cargo.toml
120 @@ -33,7 +33,7 @@ pretty_env_logger = "0.3"
121 serde = { version = "1", features = ["derive"] }
122 serde_json = "1"
123 sha2 = "0.9"
124- structopt = "0.2"
125+ structopt = "0.3"
126 tokio = "0.1"
127 url = "1"
128 uuid = { version = "0.7", features = ["v4"] }
129 diff --git a/src/main.rs b/src/main.rs
130index 61da688..17f5b29 100644
131--- a/src/main.rs
132+++ b/src/main.rs
133 @@ -70,7 +70,7 @@ struct Args {
134 s3_prefix: String,
135
136 /// Encryption key to use.
137- #[structopt(long = "key", parse(try_from_str = "FromHex::from_hex"))]
138+ #[structopt(long = "key", parse(try_from_str = FromHex::from_hex))]
139 key: [u8; 32],
140
141 /// Maximum size of the cache, in bytes. Set to 0 for an unlimited cache