diff --git a/Cargo.lock b/Cargo.lock index 4b9c58c65da..510732e9ad2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "addr2line" version = "0.13.0" @@ -115,7 +117,7 @@ dependencies = [ "flate2", "futures-core", "memchr", - "pin-project-lite", + "pin-project-lite 0.1.7", ] [[package]] @@ -252,6 +254,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + [[package]] name = "cargo-registry" version = "0.2.2" @@ -262,7 +270,7 @@ dependencies = [ "chrono", "civet", "comrak", - "conduit", + "conduit 0.9.0-alpha.3", "conduit-conditional-get", "conduit-cookie", "conduit-git-http-backend", @@ -289,7 +297,7 @@ dependencies = [ "hex", "htmlescape", "http 0.2.1", - "hyper", + "hyper 0.13.7", "hyper-tls", "indexmap", "jemallocator", @@ -309,7 +317,7 @@ dependencies = [ "swirl", "tar", "tempfile", - "tokio", + "tokio 0.2.22", "toml", "tower-service", "url", @@ -360,7 +368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2adfa9a0117908b89125b42475fa45da5cbfae6a32f06ef67043918ad054587a" dependencies = [ "civet-sys", - "conduit", + "conduit 0.9.0-alpha.3", "libc", ] @@ -404,13 +412,22 @@ dependencies = [ "http 0.2.1", ] +[[package]] +name = "conduit" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4e5a80747296346305a040817f5b717b968e1c44b0a1158083e42c923a8a96f" +dependencies = [ + "http 0.2.1", +] + [[package]] name = "conduit-conditional-get" version = "0.9.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9674cc09c0832fe181ea1db5f5f7a3d1741d756cc142e4640d8cf7a1b39b6dfa" dependencies = [ - "conduit", + "conduit 0.9.0-alpha.3", "conduit-middleware", "time 0.2.16", ] @@ -422,7 +439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae03deb30e24d1dbcbb39cfb1c4a8ec4b584935aa928cf59fd93bb4b37099d68" dependencies = [ "base64 0.12.3", - "conduit", + "conduit 0.9.0-alpha.3", "conduit-middleware", "cookie", "time 0.2.16", @@ -434,21 +451,24 @@ version = "0.9.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a41aef2b54111fa1703d7b033b518d279e5938b83e7fe94aa51bd9f3671c383" dependencies = [ - "conduit", + "conduit 0.9.0-alpha.3", "flate2", ] [[package]] name = "conduit-hyper" -version = "0.3.0-alpha.5" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f2fc542431a2f71cdf7897594e180efe0deda7044a52c3bd1e31f12356b4eb" +checksum = "f0801e6acd157308c0cf140017092e2c21934ab09e1f5bac686cc0cf0c1802d2" dependencies = [ - "conduit", + "bytes 1.3.0", + "conduit 0.10.0", "http 0.2.1", - "hyper", + "hyper 0.14.5", "percent-encoding", - "tokio", + "thiserror", + "tokio 1.18.3", + "tokio-stream", "tower-service", "tracing", ] @@ -459,7 +479,7 @@ version = "0.9.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d11aae989fb790857867a76d27cc02304d7ca743b49667e711fdb6b1ee6a5f1f" dependencies = [ - "conduit", + "conduit 0.9.0-alpha.3", ] [[package]] @@ -477,7 +497,7 @@ version = "0.9.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd55e9910b2a8c0df19155a66e7b6bcb87e3abfba2ef6ff47fa1b607e63035e" dependencies = [ - "conduit", + "conduit 0.9.0-alpha.3", "route-recognizer", ] @@ -487,7 +507,7 @@ version = "0.9.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d9ba1f0cc203d25ec9baf659a2e02503117b3cdf12eb7067563f087d9c9c2d1" dependencies = [ - "conduit", + "conduit 0.9.0-alpha.3", "conduit-mime-types", "filetime", "time 0.2.16", @@ -499,7 +519,7 @@ version = "0.9.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b2f3bd0554c5ca215e78d8569b093a9dea8e384c0f2497a30dd0cccafe1ef5" dependencies = [ - "conduit", + "conduit 0.9.0-alpha.3", ] [[package]] @@ -875,7 +895,7 @@ dependencies = [ "futures-macro", "futures-task", "memchr", - "pin-project", + "pin-project 0.4.23", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -909,7 +929,7 @@ checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] @@ -967,7 +987,7 @@ dependencies = [ "http 0.2.1", "indexmap", "slab", - "tokio", + "tokio 0.2.22", "tokio-util", "tracing", ] @@ -1093,12 +1113,29 @@ dependencies = [ "http 0.2.1", ] +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes 1.3.0", + "http 0.2.1", + "pin-project-lite 0.2.9", +] + [[package]] name = "httparse" version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +[[package]] +name = "httpdate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" + [[package]] name = "humantime" version = "1.3.0" @@ -1120,13 +1157,36 @@ dependencies = [ "futures-util", "h2", "http 0.2.1", - "http-body", + "http-body 0.3.1", "httparse", "itoa", - "pin-project", - "socket2", + "pin-project 0.4.23", + "socket2 0.3.12", "time 0.1.43", - "tokio", + "tokio 0.2.22", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" +dependencies = [ + "bytes 1.3.0", + "futures-channel", + "futures-core", + "futures-util", + "http 0.2.1", + "http-body 0.4.5", + "httparse", + "httpdate", + "itoa", + "pin-project 1.0.12", + "socket2 0.4.7", + "tokio 1.18.3", "tower-service", "tracing", "want", @@ -1139,9 +1199,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper", + "hyper 0.13.7", "native-tls", - "tokio", + "tokio 0.2.22", "tokio-tls", ] @@ -1333,9 +1393,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.74" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libgit2-sys" @@ -1540,6 +1600,18 @@ dependencies = [ "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", +] + [[package]] name = "mio-uds" version = "0.6.8" @@ -1548,7 +1620,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.22", ] [[package]] @@ -1847,7 +1919,16 @@ version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" dependencies = [ - "pin-project-internal", + "pin-project-internal 0.4.23", +] + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal 1.0.12", ] [[package]] @@ -1861,12 +1942,29 @@ dependencies = [ "syn", ] +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "pin-project-lite" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715" +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + [[package]] name = "pin-utils" version = "0.1.0" @@ -1924,11 +2022,11 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" [[package]] name = "proc-macro2" -version = "1.0.19" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -2060,8 +2158,8 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.1", - "http-body", - "hyper", + "http-body 0.3.1", + "hyper 0.13.7", "hyper-tls", "ipnet", "js-sys", @@ -2071,11 +2169,11 @@ dependencies = [ "mime_guess", "native-tls", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.1.7", "serde", "serde_json", "serde_urlencoded", - "tokio", + "tokio 0.2.22", "tokio-tls", "url", "wasm-bindgen", @@ -2345,6 +2443,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "standback" version = "0.2.9" @@ -2472,13 +2580,13 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.38" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -2552,6 +2660,26 @@ dependencies = [ "serde", ] +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "thread_local" version = "1.0.1" @@ -2631,15 +2759,39 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.22", "mio-uds", "num_cpus", - "pin-project-lite", + "pin-project-lite 0.1.7", "signal-hook-registry", "slab", "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "1.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf72287841541d34ead7e0739286b862e3bd03e5f4008c13f548277d9ce70d8" +dependencies = [ + "libc", + "mio 0.8.5", + "pin-project-lite 0.2.9", + "socket2 0.4.7", + "winapi 0.3.9", +] + +[[package]] +name = "tokio-stream" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.9", + "tokio 1.18.3", +] + [[package]] name = "tokio-tls" version = "0.3.1" @@ -2647,7 +2799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.22", ] [[package]] @@ -2660,8 +2812,8 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite", - "tokio", + "pin-project-lite 0.1.7", + "tokio 0.2.22", ] [[package]] @@ -2769,6 +2921,12 @@ dependencies = [ "matches", ] +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + [[package]] name = "unicode-normalization" version = "0.1.9" @@ -2860,6 +3018,12 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.67" @@ -2981,6 +3145,63 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "winreg" version = "0.7.0" diff --git a/Cargo.toml b/Cargo.toml index 27b71e2df7a..d97913fd4b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,7 +74,7 @@ conduit-router = "0.9.0-alpha.3" conduit-static = "0.9.0-alpha.3" conduit-git-http-backend = "0.9.0-alpha.2" civet = "0.12.0-alpha.4" -conduit-hyper = "0.3.0-alpha.5" +conduit-hyper = "0.4.2" http = "0.2" futures-util = "0.3"