diff --git a/Cargo.lock b/Cargo.lock index 304dde9..6544544 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -193,11 +193,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e69e13a99a7e6e070bb114f7ff381e58c7ccc188630121fc4c2fe4bcf24cd072" dependencies = [ "flate2", - "http 0.2.7", + "http", "log", "native-tls", "openssl", - "url 2.2.2", + "url", "wildmatch", ] @@ -341,16 +341,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] - [[package]] name = "bytes" version = "1.1.0" @@ -400,7 +390,7 @@ dependencies = [ "termcolor", "toml_edit 0.13.4", "ureq", - "url 2.2.2", + "url", ] [[package]] @@ -448,19 +438,6 @@ dependencies = [ "serde", ] -[[package]] -name = "cargo-show" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36421845bb7a91e8efac84714a7ed47f67ab1d33f97ce91e4e5c5f0c63137251" -dependencies = [ - "docopt", - "g-k-crates-io-client", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "cargo_metadata" version = "0.12.3" @@ -645,7 +622,7 @@ version = "4.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948" dependencies = [ - "bytes 1.1.0", + "bytes", "memchr 2.5.0", ] @@ -826,36 +803,6 @@ dependencies = [ "syn", ] -[[package]] -name = "curl" -version = "0.4.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d855aeef205b43f65a5001e0997d81f8efca7badad4fad7d897aa7f0d0651f" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi 0.3.9", -] - -[[package]] -name = "curl-sys" -version = "0.4.55+curl-7.83.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23734ec77368ec583c2e61dd3f0b0e5c98b93abe6d2a004ca06b91dd7e3e2762" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi 0.3.9", -] - [[package]] name = "digest" version = "0.8.1" @@ -896,18 +843,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "docopt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" -dependencies = [ - "lazy_static 1.4.0", - "regex 1.5.5", - "serde", - "strsim 0.10.0", -] - [[package]] name = "duckscript" version = "0.7.2" @@ -1044,7 +979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a5019be18538406a43b5419a5501461f0c8b49ea7dfda0cfc32f4e51fc44be1" dependencies = [ "log", - "url 2.2.2", + "url", ] [[package]] @@ -1063,28 +998,6 @@ version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -1155,7 +1068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ "matches", - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] @@ -1222,21 +1135,6 @@ dependencies = [ "waker-fn", ] -[[package]] -name = "g-k-crates-io-client" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4138de9595af0ee0120805224b86682f1a868a588c927a8f07fff9fac302c5" -dependencies = [ - "curl", - "failure", - "http 0.1.21", - "serde", - "serde_derive", - "serde_json", - "url 1.7.2", -] - [[package]] name = "generic-array" version = "0.12.4" @@ -1294,7 +1192,7 @@ dependencies = [ "log", "openssl-probe", "openssl-sys", - "url 2.2.2", + "url", ] [[package]] @@ -1403,26 +1301,15 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "http" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" -dependencies = [ - "bytes 0.4.12", - "fnv", - "itoa 0.4.8", -] - [[package]] name = "http" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", - "itoa 1.0.1", + "itoa", ] [[package]] @@ -1449,17 +1336,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.2.3" @@ -1509,15 +1385,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - [[package]] name = "itertools" version = "0.10.3" @@ -1527,12 +1394,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.1" @@ -1759,7 +1620,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4eaf053e9c62b46ca709b2a02559ef225a39bcbe98b03299dfed2eec2d1c81f" dependencies = [ "getopts", - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] @@ -1818,7 +1679,6 @@ version = "0.2.8" dependencies = [ "cargo-edit", "cargo-make", - "cargo-show", "cargo_toml", "conventional_commits_linter", "itertools", @@ -2026,12 +1886,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.1.0" @@ -2486,7 +2340,7 @@ dependencies = [ "structopt", "thiserror", "toml_edit 0.2.1", - "url 2.2.2", + "url", ] [[package]] @@ -2553,7 +2407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "indexmap", - "itoa 1.0.1", + "itoa", "ryu", "serde", ] @@ -2748,18 +2602,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - [[package]] name = "target-spec" version = "0.6.1" @@ -3022,22 +2864,11 @@ dependencies = [ "serde", "serde_json", "socks", - "url 2.2.2", + "url", "webpki", "webpki-roots", ] -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - [[package]] name = "url" version = "2.2.2" @@ -3045,9 +2876,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.2.3", + "idna", "matches", - "percent-encoding 2.1.0", + "percent-encoding", "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 92e12e2..c584d05 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,6 @@ michie-macro = { path = "macro", version = "=0.2.8" } [dev-dependencies] cargo-edit = "0.9.1" cargo-make = "0.35.12" -cargo-show = "0.5.9" cargo_toml = "0.11.5" conventional_commits_linter = "0.12.1" itertools = "0.10.3" diff --git a/Makefile.toml b/Makefile.toml index a15c9d9..529719b 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -108,9 +108,13 @@ script = ''' set -euxo pipefail cargo publish --package michie-macro attempts=0 -while [ $attempts -lt 10 ]; do - max_version=$(cargo bin cargo-show --json michie-macro | cargo bin jql '"crate"."max_version"') - if [ $max_version == "\"$1\"" ]; then +while [ $attempts -lt 90 ]; do + latest_version=$( \ + wget --quiet --output-document - 'https://raw.githubusercontent.com/rust-lang/crates.io-index/master/mi/ch/michie-macro' \ + | tail --lines 1 \ + | cargo bin jql '"vers"' \ + ) + if [ $latest_version == "\"$1\"" ]; then cargo publish --package michie exit 0 fi