From 2f3a6d34bf864cc4c50b7d76f2d2d19fe4b8eabe Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Sat, 7 Nov 2020 01:18:50 +0800 Subject: [PATCH] Deps to hyper and tower dev branch --- Cargo.lock | 281 +++++++++++++++++++++-------------------------------- Cargo.toml | 12 ++- 2 files changed, 117 insertions(+), 176 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 99d32ee5..93e9ced7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -75,9 +75,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" dependencies = [ "memchr", ] @@ -349,7 +349,17 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.7.0", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +dependencies = [ + "core-foundation-sys 0.8.2", "libc", ] @@ -359,6 +369,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +[[package]] +name = "core-foundation-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + [[package]] name = "cpuid-bool" version = "0.1.2" @@ -416,9 +432,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d0e2d24e5ee3b23a01de38eefdcd978907890701f08ffffd4cb457ca4ee8d6" +checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908" [[package]] name = "dbl" @@ -486,11 +502,11 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "flate2" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da80be589a72651dcda34d8b35bcdc9b7254ad06325611074d9cc0fbb19f60ee" +checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "crc32fast", "libc", "miniz_oxide", @@ -695,7 +711,26 @@ dependencies = [ "indexmap", "slab", "tokio 0.2.22", - "tokio-util", + "tokio-util 0.3.1", + "tracing", + "tracing-futures", +] + +[[package]] +name = "h2" +version = "0.3.0" +source = "git+https://github.com/hyperium/h2#cbbdd305b1afc1eaf19f2e3b26f9419048041e7d" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 0.3.3", + "tokio-util 0.4.0", "tracing", "tracing-futures", ] @@ -805,23 +840,22 @@ checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" [[package]] name = "hyper" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" +version = "0.14.0-dev" +source = "git+https://github.com/hyperium/hyper.git#1b9af22fa021c304f96615ef6964c4bc5ebc4601" dependencies = [ "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.0", "http", "http-body", "httparse", "httpdate", "itoa", - "pin-project 0.4.27", + "pin-project 1.0.1", "socket2", - "tokio 0.2.22", + "tokio 0.3.3", "tower-service", "tracing", "want", @@ -1184,9 +1218,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" +checksum = "1a1cda389c26d6b88f3d2dc38aa1b750fe87d298cc5d795ec9e975f402f00372" dependencies = [ "lazy_static", "libc", @@ -1195,8 +1229,8 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework 0.4.4", - "security-framework-sys 0.4.3", + "security-framework 2.0.0", + "security-framework-sys 2.0.0", "tempfile", ] @@ -1483,9 +1517,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "proc-macro-hack" @@ -1581,9 +1615,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" dependencies = [ "aho-corasick", "memchr", @@ -1593,9 +1627,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.20" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "remove_dir_all" @@ -1707,19 +1741,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "security-framework" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys 0.4.3", -] - [[package]] name = "security-framework" version = "1.0.0" @@ -1727,20 +1748,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b" dependencies = [ "bitflags", - "core-foundation", - "core-foundation-sys", + "core-foundation 0.7.0", + "core-foundation-sys 0.7.0", "libc", "security-framework-sys 1.0.0", ] [[package]] -name = "security-framework-sys" -version = "0.4.3" +name = "security-framework" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" +checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69" dependencies = [ - "core-foundation-sys", + "bitflags", + "core-foundation 0.9.1", + "core-foundation-sys 0.8.2", "libc", + "security-framework-sys 2.0.0", ] [[package]] @@ -1749,7 +1773,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.7.0", + "libc", +] + +[[package]] +name = "security-framework-sys" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b" +dependencies = [ + "core-foundation-sys 0.8.2", "libc", ] @@ -1832,12 +1866,12 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" +checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" dependencies = [ "block-buffer 0.9.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "cpuid-bool", "digest 0.9.0", "opaque-debug 0.3.0", @@ -1889,13 +1923,13 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sha-1 0.9.1", + "sha-1 0.9.2", "socket2", "spin 0.7.0", "strum", "strum_macros", "tcmalloc", - "tokio 0.3.2", + "tokio 0.3.3", "tokio-native-tls", "tokio-rustls 0.20.0", "tower", @@ -2074,18 +2108,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42" +checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab" +checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" dependencies = [ "proc-macro2", "quote", @@ -2136,7 +2170,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" dependencies = [ "bytes 0.5.6", - "fnv", "futures-core", "iovec", "lazy_static", @@ -2148,12 +2181,12 @@ dependencies = [ [[package]] name = "tokio" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f1b20504fd0aa9dab3ae17e8c4dd9431e5e08fd6921689f9745a4004883a17" +checksum = "e5ca08accbcb46f11fd8d2d1c6158c348b7888009a1f39260bcad66f6a454250" dependencies = [ + "autocfg", "bytes 0.6.0", - "fnv", "futures-core", "lazy_static", "libc", @@ -2186,7 +2219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501c8252b73bd01379aaae1521523c2629ff1bc6ea46c29e0baff515cee60f1b" dependencies = [ "native-tls", - "tokio 0.3.0", + "tokio 0.3.3", ] [[package]] @@ -2208,7 +2241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ba3f045b4a15afc543ffe6e02bae7ecf372e89a0f9f8c4b15b13f0ceed4f105" dependencies = [ "rustls 0.18.1", - "tokio 0.3.0", + "tokio 0.3.3", "webpki", ] @@ -2227,106 +2260,35 @@ dependencies = [ ] [[package]] -name = "tower" -version = "0.3.1" +name = "tokio-util" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3169017c090b7a28fce80abaad0ab4f5566423677c9331bb320af7e49cfe62" +checksum = "24793699f4665ba0416ed287dc794fe6b11a4aa5e4e95b58624f45f6c46b97d4" dependencies = [ + "bytes 0.5.6", "futures-core", - "tower-buffer", - "tower-discover", - "tower-layer", - "tower-limit", - "tower-load-shed", - "tower-retry", - "tower-service", - "tower-timeout", - "tower-util", + "futures-sink", + "log", + "pin-project-lite", + "tokio 0.3.3", ] [[package]] -name = "tower-buffer" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4887dc2a65d464c8b9b66e0e4d51c2fd6cf5b3373afc72805b0a60bce00446a" +name = "tower" +version = "0.4.0" +source = "git+https://github.com/tower-rs/tower.git#5e1e07744820028877654c336a3b9fe057bf46f1" dependencies = [ "futures-core", - "pin-project 0.4.27", - "tokio 0.2.22", + "pin-project 1.0.1", "tower-layer", "tower-service", "tracing", ] -[[package]] -name = "tower-discover" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6b5000c3c54d269cc695dff28136bb33d08cbf1df2c48129e143ab65bf3c2a" -dependencies = [ - "futures-core", - "pin-project 0.4.27", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35d656f2638b288b33495d1053ea74c40dc05ec0b92084dd71ca5566c4ed1dc" - -[[package]] -name = "tower-limit" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c3040c5dbed68abffaa0d4517ac1a454cd741044f33ab0eefab6b8d1361404" -dependencies = [ - "futures-core", - "pin-project 0.4.27", - "tokio 0.2.22", - "tower-layer", - "tower-load", - "tower-service", -] - -[[package]] -name = "tower-load" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc79fc3afd07492b7966d7efa7c6c50f8ed58d768a6075dd7ae6591c5d2017b" -dependencies = [ - "futures-core", - "log", - "pin-project 0.4.27", - "tokio 0.2.22", - "tower-discover", - "tower-service", -] - -[[package]] -name = "tower-load-shed" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f021e23900173dc315feb4b6922510dae3e79c689b74c089112066c11f0ae4e" -dependencies = [ - "futures-core", - "pin-project 0.4.27", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-retry" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6727956aaa2f8957d4d9232b308fe8e4e65d99db30f42b225646e86c9b6a952" -dependencies = [ - "futures-core", - "pin-project 0.4.27", - "tokio 0.2.22", - "tower-layer", - "tower-service", -] +source = "git+https://github.com/tower-rs/tower.git#5e1e07744820028877654c336a3b9fe057bf46f1" [[package]] name = "tower-service" @@ -2334,30 +2296,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" -[[package]] -name = "tower-timeout" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "127b8924b357be938823eaaec0608c482d40add25609481027b96198b2e4b31e" -dependencies = [ - "pin-project 0.4.27", - "tokio 0.2.22", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1093c19826d33807c72511e68f73b4a0469a3f22c2bd5f7d5212178b4b89674" -dependencies = [ - "futures-core", - "futures-util", - "pin-project 0.4.27", - "tower-service", -] - [[package]] name = "tracing" version = "0.1.21" @@ -2417,7 +2355,7 @@ dependencies = [ "bytes 0.5.6", "data-encoding", "futures", - "h2", + "h2 0.2.7", "http", "log", "rustls 0.17.0", @@ -2584,10 +2522,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" dependencies = [ + "form_urlencoded", "idna", "matches", "percent-encoding", diff --git a/Cargo.toml b/Cargo.toml index c09acfe2..5baba8e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ panic = "abort" [features] #default = ["ring-aead-ciphers", "sodium", "rc4", "aes-cfb", "aes-ctr", "trust-dns", "local-http", "local-http-rustls", "local-tunnel", "local-socks4"] -default = ["ring-aead-ciphers", "sodium", "rc4", "aes-cfb", "aes-ctr", "local-tunnel", "local-socks4"] +default = ["ring-aead-ciphers", "sodium", "rc4", "aes-cfb", "aes-ctr", "local-http", "local-http-rustls", "local-tunnel", "local-socks4"] # Enables AEAD ciphers that depending on ring # aes-128-gcm, aes-256-gcm, chacha20-ietf-poly1305 ring-aead-ciphers = ["ring"] @@ -66,7 +66,7 @@ dns-over-https = ["trust-dns", "trust-dns-resolver/dns-over-https-rustls"] openssl-vendored = ["native-tls/vendored", "openssl/vendored"] # Enable DNS-relay # Currently is only used in Android -local-dns-relay = [] +local-dns-relay = ["trust-dns-proto"] # Enable client flow statistic report # Currently is only used in Android local-flow-stat = [] @@ -116,14 +116,16 @@ byte_string = "1.0" libsodium-sys = { version = "0.2", optional = true } miscreant = { version = "0.5", default-features = false, features = ["std", "pmac"], optional = true } trust-dns-resolver = { version = "0.19", optional = true } -trust-dns-proto = "0.19" +trust-dns-proto = { version = "0.19", optional = true } hkdf = "0.10" hmac = "0.10" sha-1 = "0.9" lru_time_cache = "0.11" -hyper = { version = "0.13", optional = true } +# hyper = { version = "0.14", optional = true } +hyper = { git = "https://github.com/hyperium/hyper.git", optional = true } http = { version = "0.2", optional = true } -tower = { version = "0.3", optional = true } +# tower = { version = "0.4", optional = true } +tower = { git = "https://github.com/tower-rs/tower.git", optional = true } pin-project = "1.0" socket2 = "0.3" cfg-if = "1.0"