From 1bf38f986ca94b85a0895d5dd8081c538f49d3f1 Mon Sep 17 00:00:00 2001 From: VC Date: Mon, 18 May 2020 14:15:50 +0200 Subject: [PATCH] Trim some more fat from the executable by aligning the reqwest version of the main thread to the version of mammut --- Cargo.lock | 214 +---------------------------------------------------- Cargo.toml | 2 +- src/lib.rs | 2 +- 3 files changed, 6 insertions(+), 212 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dbbe6c5..6c4a08c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,12 +24,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "anyhow" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" - [[package]] name = "atty" version = "0.2.14" @@ -117,12 +111,6 @@ dependencies = [ "byte-tools", ] -[[package]] -name = "bumpalo" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742" - [[package]] name = "byte-tools" version = "0.3.1" @@ -653,15 +641,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "heck" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "hermit-abi" version = "0.1.8" @@ -882,15 +861,6 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" -[[package]] -name = "js-sys" -version = "0.3.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7889c7c36282151f6bf465be4700359318aef36baa951462382eae49e9577cf9" -dependencies = [ - "wasm-bindgen", -] - [[package]] name = "kernel32-sys" version = "0.2.2" @@ -947,7 +917,7 @@ dependencies = [ "doc-comment", "hyperx", "log", - "reqwest 0.9.24", + "reqwest", "serde", "serde_derive", "serde_json", @@ -1066,16 +1036,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "nom" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -dependencies = [ - "memchr", - "version_check 0.1.5", -] - [[package]] name = "num-integer" version = "0.1.42" @@ -1486,7 +1446,7 @@ dependencies = [ "native-tls", "serde", "serde_json", - "serde_urlencoded 0.5.5", + "serde_urlencoded", "time", "tokio 0.1.22", "tokio-executor", @@ -1498,41 +1458,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "reqwest" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9f62f24514117d09a8fc74b803d3d65faa27cea1c7378fb12b0d002913f3831" -dependencies = [ - "base64 0.11.0", - "bytes 0.5.4", - "encoding_rs", - "futures-core", - "futures-util", - "http 0.2.0", - "http-body 0.3.1", - "hyper 0.13.2", - "hyper-tls 0.4.1", - "js-sys", - "lazy_static", - "log", - "mime", - "mime_guess", - "native-tls", - "percent-encoding 2.1.0", - "pin-project-lite", - "serde", - "serde_urlencoded 0.6.1", - "time", - "tokio 0.2.13", - "tokio-tls", - "url 2.1.1", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - [[package]] name = "rustc-demangle" version = "0.1.16" @@ -1566,13 +1491,13 @@ dependencies = [ [[package]] name = "scootaloo" -version = "0.1.8" +version = "0.1.9" dependencies = [ "clap", "egg-mode", "htmlescape", "mammut", - "reqwest 0.10.3", + "reqwest", "serde", "tokio 0.2.13", "toml", @@ -1663,18 +1588,6 @@ dependencies = [ "url 1.7.2", ] -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa", - "serde", - "url 2.1.1", -] - [[package]] name = "sha-1" version = "0.8.2" @@ -1708,12 +1621,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" -[[package]] -name = "sourcefile" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" - [[package]] name = "string" version = "0.2.1" @@ -1852,7 +1759,6 @@ dependencies = [ "lazy_static", "memchr", "mio", - "num_cpus", "pin-project-lite", "slab", "tokio-macros", @@ -2070,12 +1976,6 @@ dependencies = [ "smallvec 1.2.0", ] -[[package]] -name = "unicode-segmentation" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" - [[package]] name = "unicode-width" version = "0.1.7" @@ -2170,112 +2070,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasm-bindgen" -version = "0.2.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5205e9afdf42282b192e2310a5b463a6d1c1d774e30dc3c791ac37ab42d2616c" -dependencies = [ - "cfg-if", - "serde", - "serde_json", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11cdb95816290b525b32587d76419facd99662a07e59d3cdb560488a819d9a45" -dependencies = [ - "bumpalo", - "lazy_static", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbdd49e3e28b40dec6a9ba8d17798245ce32b019513a845369c641b275135d9" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "574094772ce6921576fb6f2e3f7497b8a76273b6db092be18fc48a082de09dc3" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e7e61fc929f4c0dddb748b102ebf9f632e2b8d739f2016542b4de2965a9601" - -[[package]] -name = "wasm-bindgen-webidl" -version = "0.2.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef012a0d93fc0432df126a8eaf547b2dce25a8ce9212e1d3cbeef5c11157975d" -dependencies = [ - "anyhow", - "heck", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "weedle", -] - -[[package]] -name = "web-sys" -version = "0.3.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf97caf6aa8c2b1dac90faf0db529d9d63c93846cca4911856f78a83cebf53b" -dependencies = [ - "anyhow", - "js-sys", - "sourcefile", - "wasm-bindgen", - "wasm-bindgen-webidl", -] - -[[package]] -name = "weedle" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164" -dependencies = [ - "nom", -] - [[package]] name = "winapi" version = "0.2.8" diff --git a/Cargo.toml b/Cargo.toml index f1e2e39..85c4a9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,6 @@ egg-mode = "^0.14" mammut = "^0.13" -reqwest = { version = "^0.10", features = ["blocking"] } +reqwest = "^0.9" htmlescape = "^0.3" diff --git a/src/lib.rs b/src/lib.rs index dbf69cb..5b7f75e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -38,7 +38,7 @@ use mammut::{ }; // reqwest -use reqwest::blocking::Client; +use reqwest::Client; // htmlescape use htmlescape::decode_html;