diff --git a/.circleci/config.yml b/.circleci/config.yml index b00086b33..117b46fac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,8 +88,11 @@ commands: command: | cat\<< EOF > ~/.cargo/config.toml [patch.crates-io] - shuttle-service = { path = "$PWD/service" } + shuttle-codegen = { path = "$PWD/codegen" } + shuttle-common = { path = "$PWD/common" } + shuttle-proto = { path = "$PWD/proto" } shuttle-runtime = { path = "$PWD/runtime" } + shuttle-service = { path = "$PWD/service" } shuttle-aws-rds = { path = "$PWD/resources/aws-rds" } shuttle-persist = { path = "$PWD/resources/persist" } @@ -176,26 +179,30 @@ jobs: steps: - checkout - restore-cargo-cache - # Check this to make sure we do not include patched dependencies in - # the Cargo.lock. + # Check this to make sure we do not include patched dependencies in the Cargo.lock. - run: command: | - [[ -z $(cat Cargo.lock | grep "\[\[patch.unused\]\]") ]] + [ -z $(grep "\[\[patch.unused\]\]" Cargo.lock) ] - run: cargo fmt --all --check # TODO: this is incompatible with workspace inheritance, uncomment when # https://github.com/DevinR528/cargo-sort/pull/29 is merged # - run: cargo install cargo-sort # - run: cargo sort --check --workspace - - run: | - cargo clippy --tests \ - --all-targets \ - --all-features \ - --no-deps -- \ - --D warnings \ - -A clippy::let-unit-value \ - -A clippy::format-push-string + - run: cargo clippy --tests --all-targets --all-features --no-deps -- --D warnings + - save-cargo-cache + test-workspace-member: + parameters: + crate: + description: "Crate in workspace to test" + type: string + executor: docker-rust + steps: + - checkout + - restore-cargo-cache + - apply-patches + - run: cargo test --package << parameters.crate >> --all-features -- --nocapture - save-cargo-cache - check-standalone: + test-standalone: parameters: path: description: "Path to crate external from workspace" @@ -220,15 +227,13 @@ jobs: << parameters.features >> \ --manifest-path << parameters.path >>/Cargo.toml \ --no-deps -- \ - --D warnings \ - -A clippy::let-unit-value \ - -A clippy::format-push-string + --D warnings - run: cargo test << parameters.features >> --manifest-path << parameters.path >>/Cargo.toml -- --nocapture - save-cargo-cache - platform-test: + test-workspace-member-integration: parameters: crate: - description: "Crate to test" + description: "Crate in workspace to test" type: string # Using an image since tests will start a docker container executor: image-ubuntu @@ -601,64 +606,86 @@ workflows: ci: jobs: - workspace - - check-standalone: - name: << matrix.path >> + - test-workspace-member: + name: << matrix.crate >> + matrix: + parameters: + crate: + # resources + - shuttle-persist + - shuttle-secrets + - shuttle-static-folder + # services + - shuttle-actix-web + - shuttle-axum + - shuttle-next + - shuttle-poem + - shuttle-poise + - shuttle-rocket + - shuttle-salvo + - shuttle-serenity + - shuttle-thruster + - shuttle-tide + - shuttle-tower + - shuttle-warp + - test-standalone: + name: "<< matrix.path >>" matrix: parameters: path: - - resources/aws-rds - - resources/persist - - resources/secrets - - resources/static-folder - resources/turso - - services/shuttle-actix-web - - services/shuttle-axum - - services/shuttle-next - - services/shuttle-poem - - services/shuttle-poise - - services/shuttle-rocket - - services/shuttle-salvo - - services/shuttle-serenity - - services/shuttle-thruster - - services/shuttle-tide - - services/shuttle-tower - - services/shuttle-warp - - check-standalone: - # shuttle-shared-db has mutually exclusive features - # so we run checks for each feature separately + - test-standalone: + # Has mutually exclusive features, so we run checks for each feature separately name: "resources/shared-db: << matrix.features >>" matrix: - alias: check-standalone-shared-db + alias: test-standalone-shared-db parameters: - path: [resources/shared-db] + path: + - resources/shared-db features: - "-F mongodb" - "-F postgres" - "-F postgres-rustls" - - platform-test: + ############ This crate has no tests, therefore excluded. + # - test-standalone: + # # Has mutually exclusive features, so we run checks for each feature separately + # name: "resources/aws-rds: << matrix.features >>" + # matrix: + # alias: test-standalone-aws-rds + # parameters: + # path: + # - resources/aws-rds + # features: + # - "-F postgres" + # - "-F postgres-rustls" + # - "-F mysql" + # - "-F mysql-rustls" + # - "-F mariadb" + # - "-F mariadb-rustls" + - test-workspace-member-integration: name: << matrix.crate >> requires: - workspace matrix: parameters: crate: - [ - "shuttle-auth", - "cargo-shuttle", - "shuttle-codegen", - "shuttle-common", - "shuttle-deployer", - "shuttle-proto", - "shuttle-provisioner", - "shuttle-resource-recorder", - "shuttle-runtime", - "shuttle-service", - ] + - shuttle-auth + - cargo-shuttle + - shuttle-codegen + - shuttle-common + - shuttle-deployer + - shuttle-proto + - shuttle-provisioner + - shuttle-resource-recorder + - shuttle-runtime + - shuttle-service - e2e-test: requires: - - platform-test - - check-standalone - - check-standalone-shared-db + - test-workspace-member + - test-workspace-member-integration + - test-standalone + - test-standalone-shared-db + # - test-standalone-aws-rds filters: branches: only: production diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d4ac9ac1e..6e4dd94bf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -70,8 +70,11 @@ In order to test local changes to the library crates, you may want to add the be ```toml [patch.crates-io] -shuttle-service = { path = "[base]/shuttle/service" } +shuttle-codegen = { path = "[base]/shuttle/codegen" } +shuttle-common = { path = "[base]/shuttle/common" } +shuttle-proto = { path = "[base]/shuttle/proto" } shuttle-runtime = { path = "[base]/shuttle/runtime" } +shuttle-service = { path = "[base]/shuttle/service" } shuttle-aws-rds = { path = "[base]/shuttle/resources/aws-rds" } shuttle-persist = { path = "[base]/shuttle/resources/persist" } diff --git a/Cargo.lock b/Cargo.lock index f1c5b67c2..6bdc137a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,187 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "actix-codec" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" +dependencies = [ + "bitflags 1.3.2", + "bytes 1.4.0", + "futures-core", + "futures-sink", + "memchr", + "pin-project-lite 0.2.9", + "tokio", + "tokio-util 0.7.8", + "tracing", +] + +[[package]] +name = "actix-http" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", + "ahash 0.8.3", + "base64 0.21.2", + "bitflags 1.3.2", + "brotli", + "bytes 1.4.0", + "bytestring", + "derive_more", + "encoding_rs", + "flate2", + "futures-core", + "h2", + "http 0.2.9", + "httparse", + "httpdate", + "itoa 1.0.6", + "language-tags", + "local-channel", + "mime", + "percent-encoding", + "pin-project-lite 0.2.9", + "rand 0.8.5", + "sha1 0.10.5", + "smallvec", + "tokio", + "tokio-util 0.7.8", + "tracing", + "zstd 0.12.3+zstd.1.5.2", +] + +[[package]] +name = "actix-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "actix-router" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" +dependencies = [ + "bytestring", + "http 0.2.9", + "regex", + "serde", + "tracing", +] + +[[package]] +name = "actix-rt" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" +dependencies = [ + "futures-core", + "tokio", +] + +[[package]] +name = "actix-server" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e8613a75dd50cc45f473cee3c34d59ed677c0f7b44480ce3b8247d7dc519327" +dependencies = [ + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "futures-util", + "mio", + "num_cpus", + "socket2 0.4.9", + "tokio", + "tracing", +] + +[[package]] +name = "actix-service" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" +dependencies = [ + "futures-core", + "paste", + "pin-project-lite 0.2.9", +] + +[[package]] +name = "actix-utils" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" +dependencies = [ + "local-waker", + "pin-project-lite 0.2.9", +] + +[[package]] +name = "actix-web" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" +dependencies = [ + "actix-codec", + "actix-http", + "actix-macros", + "actix-router", + "actix-rt", + "actix-server", + "actix-service", + "actix-utils", + "actix-web-codegen", + "ahash 0.7.6", + "bytes 1.4.0", + "bytestring", + "cfg-if 1.0.0", + "cookie 0.16.2", + "derive_more", + "encoding_rs", + "futures-core", + "futures-util", + "http 0.2.9", + "itoa 1.0.6", + "language-tags", + "log", + "mime", + "once_cell", + "pin-project-lite 0.2.9", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "socket2 0.4.9", + "time 0.3.22", + "url", +] + +[[package]] +name = "actix-web-codegen" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9" +dependencies = [ + "actix-router", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "addr2line" version = "0.19.0" @@ -17,13 +198,102 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array", +] + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher 0.2.5", +] + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if 1.0.0", + "cipher 0.4.4", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +dependencies = [ + "aead 0.3.2", + "aes 0.6.0", + "cipher 0.2.5", + "ctr 0.6.0", + "ghash 0.3.1", + "subtle", +] + +[[package]] +name = "aes-gcm" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +dependencies = [ + "aead 0.5.2", + "aes 0.8.3", + "cipher 0.4.4", + "ctr 0.9.2", + "ghash 0.5.0", + "subtle", +] + +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher 0.2.5", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher 0.2.5", + "opaque-debug", +] + [[package]] name = "ahash" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom", + "getrandom 0.2.10", "once_cell", "version_check", ] @@ -36,7 +306,7 @@ checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if 1.0.0", "const-random", - "getrandom", + "getrandom 0.2.10", "once_cell", "version_check", ] @@ -68,6 +338,21 @@ dependencies = [ "as-slice", ] +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "allocator-api2" version = "0.2.15" @@ -112,15 +397,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -202,7 +487,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time", + "time 0.3.22", ] [[package]] @@ -243,6 +528,93 @@ dependencies = [ "wait-timeout", ] +[[package]] +name = "async-channel" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-dup" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" +dependencies = [ + "futures-io", + "simple-mutex", +] + +[[package]] +name = "async-executor" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", + "tokio", +] + +[[package]] +name = "async-h1" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8101020758a4fc3a7c326cb42aa99e9fa77cbfb76987c128ad956406fe1f70a7" +dependencies = [ + "async-channel", + "async-dup", + "async-std", + "futures-core", + "http-types", + "httparse", + "log", + "pin-project", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg 1.1.0", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix 0.37.20", + "slab", + "socket2 0.4.9", + "waker-fn", +] + [[package]] name = "async-lock" version = "2.7.0" @@ -252,6 +624,45 @@ dependencies = [ "event-listener", ] +[[package]] +name = "async-process" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +dependencies = [ + "async-io", + "async-lock", + "autocfg 1.1.0", + "blocking", + "cfg-if 1.0.0", + "event-listener", + "futures-lite", + "rustix 0.37.20", + "signal-hook", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-session" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345022a2eed092cd105cc1b26fd61c341e100bd5fcbbd792df4baf31c2cc631f" +dependencies = [ + "anyhow", + "async-std", + "async-trait", + "base64 0.12.3", + "bincode", + "blake3", + "chrono", + "hmac 0.8.1", + "kv-log-macro", + "rand 0.7.3", + "serde", + "serde_json", + "sha2 0.9.9", +] + [[package]] name = "async-session" version = "3.0.0" @@ -267,12 +678,53 @@ dependencies = [ "chrono", "hmac 0.11.0", "log", - "rand", + "rand 0.8.5", "serde", "serde_json", "sha2 0.9.9", ] +[[package]] +name = "async-sse" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53bba003996b8fd22245cd0c59b869ba764188ed435392cf2796d03b805ade10" +dependencies = [ + "async-channel", + "async-std", + "http-types", + "log", + "memchr", + "pin-project-lite 0.1.12", +] + +[[package]] +name = "async-std" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +dependencies = [ + "async-channel", + "async-global-executor", + "async-io", + "async-lock", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite 0.2.9", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + [[package]] name = "async-stream" version = "0.3.5" @@ -281,7 +733,7 @@ checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", - "pin-project-lite", + "pin-project-lite 0.2.9", ] [[package]] @@ -295,6 +747,12 @@ dependencies = [ "syn 2.0.18", ] +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + [[package]] name = "async-trait" version = "0.1.68" @@ -306,6 +764,22 @@ dependencies = [ "syn 2.0.18", ] +[[package]] +name = "async-tungstenite" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1b71b31561643aa8e7df3effe284fa83ab1a840e52294c5f4bd7bfd8b2becbb" +dependencies = [ + "futures-io", + "futures-util", + "log", + "pin-project-lite 0.2.9", + "tokio", + "tokio-rustls 0.23.4", + "tungstenite 0.17.3", + "webpki-roots 0.22.6", +] + [[package]] name = "atoi" version = "1.0.0" @@ -315,6 +789,18 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atomic" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + [[package]] name = "atty" version = "0.2.14" @@ -326,6 +812,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "autocfg" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.1.0", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -349,13 +844,13 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes", + "bytes 1.4.0", "fastrand", "hex", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "ring", - "time", + "time 0.3.22", "tokio", "tower", "tracing", @@ -385,7 +880,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", - "http", + "http 0.2.9", "regex", "tracing", ] @@ -400,12 +895,12 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", - "bytes", - "http", - "http-body", + "bytes 1.4.0", + "http 0.2.9", + "http-body 0.4.5", "lazy_static", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.2.9", "tracing", ] @@ -428,8 +923,8 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes", - "http", + "bytes 1.4.0", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -453,8 +948,8 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes", - "http", + "bytes 1.4.0", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -480,8 +975,8 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes", - "http", + "bytes 1.4.0", + "http 0.2.9", "regex", "tower", "tracing", @@ -497,7 +992,7 @@ dependencies = [ "aws-sigv4", "aws-smithy-http", "aws-types", - "http", + "http 0.2.9", "tracing", ] @@ -511,12 +1006,12 @@ dependencies = [ "form_urlencoded", "hex", "hmac 0.12.1", - "http", + "http 0.2.9", "once_cell", "percent-encoding", "regex", "sha2 0.10.7", - "time", + "time 0.3.22", "tracing", ] @@ -527,7 +1022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13bda3996044c202d75b91afeb11a9afae9db9a721c6a7a427410018e286b880" dependencies = [ "futures-util", - "pin-project-lite", + "pin-project-lite 0.2.9", "tokio", "tokio-stream", ] @@ -542,14 +1037,14 @@ dependencies = [ "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-types", - "bytes", + "bytes 1.4.0", "fastrand", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "hyper-rustls 0.23.2", "lazy_static", - "pin-project-lite", + "pin-project-lite 0.2.9", "rustls 0.20.8", "tokio", "tower", @@ -563,18 +1058,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28" dependencies = [ "aws-smithy-types", - "bytes", + "bytes 1.4.0", "bytes-utils", "futures-core", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "once_cell", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.2.9", "pin-utils", "tokio", - "tokio-util", + "tokio-util 0.7.8", "tracing", ] @@ -586,10 +1081,10 @@ checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9" dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes", - "http", - "http-body", - "pin-project-lite", + "bytes 1.4.0", + "http 0.2.9", + "http-body 0.4.5", + "pin-project-lite 0.2.9", "tower", "tracing", ] @@ -620,10 +1115,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16a3d0bf4f324f4ef9793b86a1701d9700fbcdbd12a846da45eed104c634c6e8" dependencies = [ "base64-simd", - "itoa", + "itoa 1.0.6", "num-integer", "ryu", - "time", + "time 0.3.22", ] [[package]] @@ -646,7 +1141,7 @@ dependencies = [ "aws-smithy-client", "aws-smithy-http", "aws-smithy-types", - "http", + "http 0.2.9", "rustc_version 0.4.0", "tracing", ] @@ -660,25 +1155,25 @@ dependencies = [ "async-trait", "axum-core", "base64 0.21.2", - "bitflags", - "bytes", + "bitflags 1.3.2", + "bytes 1.4.0", "futures-util", "headers", - "http", - "http-body", - "hyper", - "itoa", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", + "itoa 1.0.6", "matchit", "memchr", "mime", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.2.9", "rustversion", "serde", "serde_json", "serde_path_to_error", "serde_urlencoded", - "sha1", + "sha1 0.10.5", "sync_wrapper", "tokio", "tokio-tungstenite 0.18.0", @@ -694,10 +1189,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes", + "bytes 1.4.0", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -711,12 +1206,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9a320103719de37b7b4da4c8eb629d4573f6bcfd3dfe80d3208806895ccf81d" dependencies = [ "axum", - "bytes", + "bytes 1.4.0", "cookie 0.16.2", "futures-util", - "http", + "http 0.2.9", "mime", - "pin-project-lite", + "pin-project-lite 0.2.9", "tokio", "tower", "tower-http 0.3.5", @@ -732,17 +1227,17 @@ checksum = "febf23ab04509bd7672e6abe76bd8277af31b679e89fa5ffc6087dc289a448a3" dependencies = [ "axum", "axum-core", - "bytes", + "bytes 1.4.0", "cookie 0.17.0", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "mime", - "pin-project-lite", + "pin-project-lite 0.2.9", "serde", "tokio", "tower", - "tower-http 0.4.0", + "tower-http 0.4.1", "tower-layer", "tower-service", ] @@ -754,12 +1249,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bace45b270e36e3c27a190c65883de6dfc9f1d18c829907c127464815dc67b24" dependencies = [ "arc-swap", - "bytes", + "bytes 1.4.0", "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", + "pin-project-lite 0.2.9", "rustls 0.20.8", "rustls-pemfile", "tokio", @@ -773,16 +1268,28 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b114309d293dd8a6fedebf09d5b8bbb0f7647b3d204ca0dd333b5f797aed5c8" dependencies = [ - "async-session", + "async-session 3.0.0", "axum", "axum-extra 0.4.2", "futures", - "http-body", + "http-body 0.4.5", "tokio", "tower", "tracing", ] +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base64" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" + [[package]] name = "base64" version = "0.13.1" @@ -820,6 +1327,12 @@ dependencies = [ "serde", ] +[[package]] +name = "binascii" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" + [[package]] name = "bincode" version = "1.3.3" @@ -850,6 +1363,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded" + [[package]] name = "bitvec" version = "1.0.1" @@ -895,6 +1414,21 @@ dependencies = [ "generic-array", ] +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + [[package]] name = "bollard" version = "0.14.0" @@ -903,15 +1437,15 @@ checksum = "af254ed2da4936ef73309e9597180558821cb16ae9bba4cb24ce6b612d8d80ed" dependencies = [ "base64 0.21.2", "bollard-stubs", - "bytes", + "bytes 1.4.0", "futures-core", "futures-util", "hex", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "hyperlocal", "log", - "pin-project-lite", + "pin-project-lite 0.2.9", "serde", "serde_derive", "serde_json", @@ -919,7 +1453,7 @@ dependencies = [ "serde_urlencoded", "thiserror", "tokio", - "tokio-util", + "tokio-util 0.7.8", "url", "winapi", ] @@ -934,6 +1468,27 @@ dependencies = [ "serde_with 2.3.3", ] +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bson" version = "2.6.1" @@ -947,12 +1502,12 @@ dependencies = [ "indexmap", "js-sys", "lazy_static", - "rand", + "rand 0.8.5", "serde", "serde_bytes", "serde_json", - "time", - "uuid", + "time 0.3.22", + "uuid 1.3.4", ] [[package]] @@ -988,6 +1543,22 @@ 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 = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + [[package]] name = "bytes" version = "1.4.0" @@ -1000,10 +1571,19 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" dependencies = [ - "bytes", + "bytes 1.4.0", "either", ] +[[package]] +name = "bytestring" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae" +dependencies = [ + "bytes 1.4.0", +] + [[package]] name = "camino" version = "1.1.4" @@ -1049,7 +1629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d25555efacb0b5244cf1d35833d55d21abc916fff0eaad254b8e2453ea9b8ab" dependencies = [ "ambient-authority", - "rand", + "rand 0.8.5", ] [[package]] @@ -1175,7 +1755,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "uuid", + "uuid 1.3.4", "webbrowser", ] @@ -1228,11 +1808,33 @@ checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", + "time 0.1.45", + "wasm-bindgen", "winapi", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clap" version = "4.2.7" @@ -1252,7 +1854,7 @@ checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ "anstream", "anstyle", - "bitflags", + "bitflags 1.3.2", "clap_lex", "strsim", ] @@ -1284,6 +1886,15 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "colorchoice" version = "1.0.0" @@ -1307,7 +1918,7 @@ version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "bytes", + "bytes 1.4.0", "memchr", ] @@ -1329,6 +1940,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" version = "0.15.7" @@ -1358,12 +1978,18 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" dependencies = [ - "getrandom", + "getrandom 0.2.10", "once_cell", "proc-macro-hack", "tiny-keccak", ] +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1376,6 +2002,23 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "cookie" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" +dependencies = [ + "aes-gcm 0.8.0", + "base64 0.13.1", + "hkdf 0.10.0", + "hmac 0.10.1", + "percent-encoding", + "rand 0.8.5", + "sha2 0.9.9", + "time 0.2.27", + "version_check", +] + [[package]] name = "cookie" version = "0.16.2" @@ -1385,10 +2028,10 @@ dependencies = [ "base64 0.20.0", "hmac 0.12.1", "percent-encoding", - "rand", + "rand 0.8.5", "sha2 0.10.7", "subtle", - "time", + "time 0.3.22", "version_check", ] @@ -1398,8 +2041,14 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ + "aes-gcm 0.10.2", + "base64 0.21.2", + "hmac 0.12.1", "percent-encoding", - "time", + "rand 0.8.5", + "sha2 0.10.7", + "subtle", + "time 0.3.22", "version_check", ] @@ -1437,6 +2086,12 @@ dependencies = [ "libc", ] +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + [[package]] name = "cranelift-bforest" version = "0.94.1" @@ -1586,7 +2241,7 @@ version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ - "autocfg", + "autocfg 1.1.0", "cfg-if 1.0.0", "crossbeam-utils", "memoffset 0.9.0", @@ -1618,7 +2273,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", @@ -1637,6 +2292,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "cruet" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "113a9e83d8f614be76de8df1f25bf9d0ea6e85ea573710a3d3f3abe1438ae49c" +dependencies = [ + "once_cell", + "regex", +] + [[package]] name = "crunchy" version = "0.2.2" @@ -1650,6 +2315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] @@ -1663,6 +2329,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "crypto-mac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +dependencies = [ + "generic-array", + "subtle", +] + [[package]] name = "crypto-mac" version = "0.11.1" @@ -1683,6 +2359,24 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ctr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +dependencies = [ + "cipher 0.2.5", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher 0.4.4", +] + [[package]] name = "cvt" version = "0.1.2" @@ -1698,8 +2392,18 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", ] [[package]] @@ -1716,13 +2420,38 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", +] + [[package]] name = "darling_macro" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core", + "darling_core 0.13.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", "quote", "syn 1.0.109", ] @@ -1738,6 +2467,7 @@ dependencies = [ "lock_api", "once_cell", "parking_lot_core 0.9.8", + "serde", ] [[package]] @@ -1784,6 +2514,39 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "devise" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6eacefd3f541c66fc61433d65e54e0e46e0a029a819a7dbbc7a7b489e8a85f8" +dependencies = [ + "devise_codegen", + "devise_core", +] + +[[package]] +name = "devise_codegen" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8cf4b8dd484ede80fd5c547592c46c3745a617c8af278e2b72bea86b2dfed6" +dependencies = [ + "devise_core", + "quote", +] + +[[package]] +name = "devise_core" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b50dba0afdca80b187392b24f2499a88c336d5a8493e4b4ccfb608708be56a" +dependencies = [ + "bitflags 2.3.2", + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.18", +] + [[package]] name = "dialoguer" version = "0.10.4" @@ -1891,6 +2654,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + [[package]] name = "displaydoc" version = "0.2.4" @@ -1953,6 +2722,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "enumflags2" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +dependencies = [ + "enumflags2_derive", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + [[package]] name = "env_logger" version = "0.10.0" @@ -1966,6 +2755,15 @@ dependencies = [ "termcolor", ] +[[package]] +name = "erased-serde" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" +dependencies = [ + "serde", +] + [[package]] name = "errno" version = "0.3.1" @@ -2019,6 +2817,36 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "femme" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc04871e5ae3aa2952d552dae6b291b3099723bf779a8054281c1366a54613ef" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "figment" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5" +dependencies = [ + "atomic", + "pear", + "serde", + "toml 0.7.4", + "uncased", + "version_check", +] + [[package]] name = "file-per-thread-logger" version = "0.1.6" @@ -2147,6 +2975,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + [[package]] name = "funty" version = "2.0.0" @@ -2212,6 +3052,21 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite 0.2.9", + "waker-fn", +] + [[package]] name = "futures-macro" version = "0.3.28" @@ -2248,7 +3103,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite", + "pin-project-lite 0.2.9", "pin-utils", "slab", ] @@ -2271,6 +3126,19 @@ dependencies = [ "byteorder", ] +[[package]] +name = "generator" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -2281,6 +3149,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + [[package]] name = "getrandom" version = "0.2.10" @@ -2290,10 +3169,30 @@ dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] +[[package]] +name = "ghash" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +dependencies = [ + "opaque-debug", + "polyval 0.4.5", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval 0.6.1", +] + [[package]] name = "gimli" version = "0.27.3" @@ -2311,7 +3210,7 @@ version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -2329,7 +3228,7 @@ dependencies = [ "bstr", "btoi", "gix-date", - "itoa", + "itoa 1.0.6", "nom", "thiserror", ] @@ -2362,7 +3261,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d09154c0c8677e4da0ec35e896f56ee3e338e741b9599fae06075edd83a4081c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bstr", "gix-path", "libc", @@ -2376,9 +3275,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b96271912ce39822501616f177dea7218784e6c63be90d5f36322ff3a722aae2" dependencies = [ "bstr", - "itoa", + "itoa 1.0.6", "thiserror", - "time", + "time 0.3.22", ] [[package]] @@ -2418,7 +3317,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bstr", ] @@ -2466,7 +3365,7 @@ dependencies = [ "gix-hash 0.10.4", "gix-validate", "hex", - "itoa", + "itoa 1.0.6", "nom", "smallvec", "thiserror", @@ -2507,7 +3406,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" dependencies = [ - "bitflags", + "bitflags 1.3.2", "dirs 4.0.0", "gix-path", "libc", @@ -2565,22 +3464,34 @@ dependencies = [ "regex", ] +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "h2" version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ - "bytes", + "bytes 1.4.0", "fnv", "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.8", "tracing", ] @@ -2625,13 +3536,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags", - "bytes", + "bitflags 1.3.2", + "bytes 1.4.0", "headers-core", - "http", + "http 0.2.9", "httpdate", "mime", - "sha1", + "sha1 0.10.5", ] [[package]] @@ -2640,7 +3551,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.9", ] [[package]] @@ -2682,6 +3593,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hkdf" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" +dependencies = [ + "digest 0.9.0", + "hmac 0.10.1", +] + [[package]] name = "hkdf" version = "0.12.3" @@ -2691,6 +3612,26 @@ dependencies = [ "hmac 0.12.1", ] +[[package]] +name = "hmac" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" +dependencies = [ + "crypto-mac 0.8.0", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.1", + "digest 0.9.0", +] + [[package]] name = "hmac" version = "0.11.0" @@ -2730,15 +3671,26 @@ dependencies = [ "winapi", ] +[[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.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes", + "bytes 1.4.0", "fnv", - "itoa", + "itoa 1.0.6", ] [[package]] @@ -2747,9 +3699,44 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes", - "http", - "pin-project-lite", + "bytes 1.4.0", + "http 0.2.9", + "pin-project-lite 0.2.9", +] + +[[package]] +name = "http-body" +version = "1.0.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951dfc2e32ac02d67c90c0d65bd27009a635dc9b381a2cc7d284ab01e3a0150d" +dependencies = [ + "bytes 1.4.0", + "http 0.2.9", +] + +[[package]] +name = "http-body-util" +version = "0.1.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92445bc9cc14bfa0a3ce56817dc3b5bcc227a168781a356b702410789cec0d10" +dependencies = [ + "bytes 1.4.0", + "futures-util", + "http 0.2.9", + "http-body 1.0.0-rc.2", + "pin-project-lite 0.2.9", +] + +[[package]] +name = "http-client" +version = "6.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5" +dependencies = [ + "async-trait", + "cfg-if 1.0.0", + "http-types", + "log", ] [[package]] @@ -2764,8 +3751,30 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e272971f774ba29341db2f686255ff8a979365a26fb9e4277f6b6d9ec0cdd5e" dependencies = [ - "http", + "http 0.2.9", + "serde", +] + +[[package]] +name = "http-types" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" +dependencies = [ + "anyhow", + "async-channel", + "async-std", + "base64 0.13.1", + "cookie 0.14.4", + "futures-lite", + "infer", + "pin-project-lite 0.2.9", + "rand 0.7.3", "serde", + "serde_json", + "serde_qs", + "serde_urlencoded", + "url", ] [[package]] @@ -2792,17 +3801,17 @@ version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ - "bytes", + "bytes 1.4.0", "futures-channel", "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", - "itoa", - "pin-project-lite", + "itoa 1.0.6", + "pin-project-lite 0.2.9", "socket2 0.4.9", "tokio", "tower-service", @@ -2810,12 +3819,34 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.0.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75264b2003a3913f118d35c586e535293b3e22e41f074930762929d071e092" +dependencies = [ + "bytes 1.4.0", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.9", + "http-body 1.0.0-rc.2", + "httparse", + "httpdate", + "itoa 1.0.6", + "pin-project-lite 0.2.9", + "tokio", + "tracing", + "want", +] + [[package]] name = "hyper-reverse-proxy" version = "0.5.2-dev" source = "git+https://github.com/chesedo/hyper-reverse-proxy?branch=bug/host_header#5f82b7dffe940abf896fe47dadf6c8e87ddc670b" dependencies = [ - "hyper", + "hyper 0.14.26", "lazy_static", "tokio", "tracing", @@ -2827,8 +3858,8 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "log", "rustls 0.20.8", "rustls-native-certs", @@ -2842,8 +3873,8 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "rustls 0.21.2", "rustls-native-certs", "tokio", @@ -2856,8 +3887,8 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", - "pin-project-lite", + "hyper 0.14.26", + "pin-project-lite 0.2.9", "tokio", "tokio-io-timeout", ] @@ -2870,7 +3901,7 @@ checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" dependencies = [ "futures-util", "hex", - "hyper", + "hyper 0.14.26", "pin-project", "tokio", ] @@ -2954,7 +3985,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg", + "autocfg 1.1.0", "hashbrown 0.12.3", "serde", ] @@ -2978,6 +4009,27 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" +[[package]] +name = "infer" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" version = "0.1.12" @@ -2997,7 +4049,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d50eb225913c1903c788287ddd0b16369771e5abc988756a5e5927390ba04f" dependencies = [ "base64 0.21.2", - "hyper", + "hyper 0.14.26", "hyper-rustls 0.24.0", "ring", "serde", @@ -3026,6 +4078,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + [[package]] name = "ipconfig" version = "0.3.2" @@ -3065,6 +4126,12 @@ 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.6" @@ -3155,6 +4222,21 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "language-tags" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" + [[package]] name = "lazy_static" version = "1.4.0" @@ -3276,7 +4358,7 @@ dependencies = [ "pest_derive", "regex", "serde", - "time", + "time 0.3.22", ] [[package]] @@ -3301,17 +4383,35 @@ dependencies = [ "once_cell", "percent-encoding", "regex", - "time", + "time 0.3.22", "unicode-segmentation", ] +[[package]] +name = "local-channel" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c" +dependencies = [ + "futures-core", + "futures-sink", + "futures-util", + "local-waker", +] + +[[package]] +name = "local-waker" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" + [[package]] name = "lock_api" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ - "autocfg", + "autocfg 1.1.0", "scopeguard", ] @@ -3320,6 +4420,25 @@ name = "log" version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +dependencies = [ + "serde", + "value-bag", +] + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if 1.0.0", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] [[package]] name = "lru-cache" @@ -3420,7 +4539,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg", + "autocfg 1.1.0", ] [[package]] @@ -3429,7 +4548,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ - "autocfg", + "autocfg 1.1.0", ] [[package]] @@ -3438,7 +4557,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "autocfg", + "autocfg 1.1.0", ] [[package]] @@ -3480,7 +4599,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] @@ -3492,7 +4611,7 @@ checksum = "ebe15399de63ad4294c80069967736cbb87ebe467a8cd0629df9cab88a6fbde6" dependencies = [ "async-trait", "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bson", "chrono", "derivative", @@ -3507,7 +4626,7 @@ dependencies = [ "md-5", "pbkdf2", "percent-encoding", - "rand", + "rand 0.8.5", "rustc_version_runtime", "rustls 0.20.8", "rustls-pemfile", @@ -3523,27 +4642,56 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls 0.23.4", - "tokio-util", + "tokio-util 0.7.8", "trust-dns-proto", "trust-dns-resolver", "typed-builder", - "uuid", + "uuid 1.3.4", "webpki-roots 0.22.6", ] +[[package]] +name = "multer" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +dependencies = [ + "bytes 1.4.0", + "encoding_rs", + "futures-util", + "http 0.2.9", + "httparse", + "log", + "memchr", + "mime", + "spin 0.9.8", + "tokio", + "tokio-util 0.7.8", + "version_check", +] + [[package]] name = "multimap" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +[[package]] +name = "multimap" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70db9248a93dc36a36d9a47898caa007a32755c7ad140ec64eeeb50d5a730631" +dependencies = [ + "serde", +] + [[package]] name = "names" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ - "rand", + "rand 0.8.5", ] [[package]] @@ -3552,14 +4700,25 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" +[[package]] +name = "net2" +version = "0.2.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi", +] + [[package]] name = "nix" version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ - "autocfg", - "bitflags", + "autocfg 1.1.0", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -3572,7 +4731,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "static_assertions", @@ -3622,7 +4781,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ - "autocfg", + "autocfg 1.1.0", "num-integer", "num-traits", ] @@ -3633,7 +4792,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "autocfg", + "autocfg 1.1.0", "num-traits", ] @@ -3643,7 +4802,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ - "autocfg", + "autocfg 1.1.0", "libm", ] @@ -3716,11 +4875,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.54" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -3757,9 +4916,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.88" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ "cc", "libc", @@ -3785,8 +4944,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a819b71d6530c4297b49b3cae2939ab3a8cc1b9f382826a1bc29dd0ca3864906" dependencies = [ "async-trait", - "bytes", - "http", + "bytes 1.4.0", + "http 0.2.9", "opentelemetry_api", ] @@ -3799,7 +4958,7 @@ dependencies = [ "async-trait", "futures", "futures-util", - "http", + "http 0.2.9", "opentelemetry", "opentelemetry-proto", "prost", @@ -3832,7 +4991,7 @@ dependencies = [ "futures-util", "indexmap", "once_cell", - "pin-project-lite", + "pin-project-lite 0.2.9", "thiserror", "urlencoding", ] @@ -3853,7 +5012,7 @@ dependencies = [ "once_cell", "opentelemetry_api", "percent-encoding", - "rand", + "rand 0.8.5", "thiserror", "tokio", "tokio-stream", @@ -3865,6 +5024,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "ordered-float" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +dependencies = [ + "num-traits", +] + [[package]] name = "os_pipe" version = "1.1.4" @@ -3896,6 +5064,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + [[package]] name = "parking_lot" version = "0.11.2" @@ -3977,6 +5151,29 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "pear" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec95680a7087503575284e5063e14b694b7a9c0b065e5dceec661e0497127e8" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9661a3a53f93f09f2ea882018e4d7c88f6ff2956d809a276060476fd8c879d3c" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.18", +] + [[package]] name = "pem" version = "1.1.1" @@ -4066,6 +5263,12 @@ dependencies = [ "syn 2.0.18", ] +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + [[package]] name = "pin-project-lite" version = "0.2.9" @@ -4093,6 +5296,117 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "poem" +version = "1.3.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a56df40b79ebdccf7986b337f9b0e51ac55cd5e9d21fb20b6aa7c7d49741854" +dependencies = [ + "async-trait", + "bytes 1.4.0", + "futures-util", + "headers", + "http 0.2.9", + "hyper 0.14.26", + "mime", + "parking_lot 0.12.1", + "percent-encoding", + "pin-project-lite 0.2.9", + "poem-derive", + "regex", + "rfc7239", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "thiserror", + "tokio", + "tokio-util 0.7.8", + "tracing", +] + +[[package]] +name = "poem-derive" +version = "1.3.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1701f977a2d650a03df42c053686ea0efdb83554f34c7b026b89383c0a1b7846" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "poise" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d591af1c934c29adda172665f69b837e642d4fee85598baffb95dd98110467d" +dependencies = [ + "async-trait", + "derivative", + "futures-core", + "futures-util", + "log", + "once_cell", + "parking_lot 0.12.1", + "poise_macros", + "regex", + "serenity", + "tokio", +] + +[[package]] +name = "poise_macros" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40270099e1527efae99fdc0609d397e76310b529d4980ad38ab14d81803ca0fa" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg 1.1.0", + "bitflags 1.3.2", + "cfg-if 1.0.0", + "concurrent-queue", + "libc", + "log", + "pin-project-lite 0.2.9", + "windows-sys 0.48.0", +] + +[[package]] +name = "polyval" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +dependencies = [ + "cpuid-bool", + "opaque-debug", + "universal-hash 0.4.1", +] + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "opaque-debug", + "universal-hash 0.5.1", +] + [[package]] name = "portable-atomic" version = "1.3.3" @@ -4105,7 +5419,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" dependencies = [ - "rand", + "rand 0.8.5", ] [[package]] @@ -4164,6 +5478,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.10", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4203,6 +5527,19 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", + "version_check", + "yansi", +] + [[package]] name = "proptest" version = "1.2.0" @@ -4210,13 +5547,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", - "rand", - "rand_chacha", - "rand_xorshift", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_xorshift 0.3.0", "regex-syntax 0.6.29", "rusty-fork", "tempfile", @@ -4227,131 +5564,278 @@ dependencies = [ name = "prost" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes 1.4.0", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes 1.4.0", + "heck", + "itertools", + "lazy_static", + "log", + "multimap 0.8.3", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "pulldown-cmark" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +dependencies = [ + "bitflags 1.3.2", + "memchr", + "unicase", +] + +[[package]] +name = "queues" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1475abae4f8ad4998590fe3acfe20104f0a5d48fc420c817cd2c09c3f56151f0" + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.8", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", + "rand_hc 0.1.0", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift 0.1.1", + "winapi", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc 0.2.0", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" dependencies = [ - "bytes", - "prost-derive", + "autocfg 0.1.8", + "rand_core 0.3.1", ] [[package]] -name = "prost-build" -version = "0.11.9" +name = "rand_chacha" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ - "bytes", - "heck", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", + "ppv-lite86", + "rand_core 0.5.1", ] [[package]] -name = "prost-derive" -version = "0.11.9" +name = "rand_chacha" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.109", + "ppv-lite86", + "rand_core 0.6.4", ] [[package]] -name = "prost-types" -version = "0.11.9" +name = "rand_core" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" dependencies = [ - "prost", + "rand_core 0.4.2", ] [[package]] -name = "psm" -version = "0.1.21" +name = "rand_core" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "cc", + "getrandom 0.1.16", ] [[package]] -name = "pulldown-cmark" -version = "0.8.0" +name = "rand_core" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "bitflags", - "memchr", - "unicase", + "getrandom 0.2.10", ] [[package]] -name = "queues" -version = "1.1.0" +name = "rand_hc" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1475abae4f8ad4998590fe3acfe20104f0a5d48fc420c817cd2c09c3f56151f0" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] [[package]] -name = "quick-error" -version = "1.2.3" +name = "rand_hc" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] [[package]] -name = "quote" -version = "1.0.28" +name = "rand_isaac" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" dependencies = [ - "proc-macro2", + "rand_core 0.3.1", ] [[package]] -name = "radium" -version = "0.7.0" +name = "rand_jitter" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi", +] [[package]] -name = "rand" -version = "0.8.5" +name = "rand_os" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" dependencies = [ + "cloudabi", + "fuchsia-cprng", "libc", - "rand_chacha", - "rand_core", + "rand_core 0.4.2", + "rdrand", + "winapi", ] [[package]] -name = "rand_chacha" -version = "0.3.1" +name = "rand_pcg" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" dependencies = [ - "ppv-lite86", - "rand_core", + "autocfg 0.1.8", + "rand_core 0.4.2", ] [[package]] -name = "rand_core" -version = "0.6.4" +name = "rand_xorshift" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" dependencies = [ - "getrandom", + "rand_core 0.3.1", ] [[package]] @@ -4360,7 +5844,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -4399,17 +5883,26 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time", + "time 0.3.22", "yasna", ] +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + [[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4418,7 +5911,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4427,11 +5920,31 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] +[[package]] +name = "ref-cast" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + [[package]] name = "regalloc2" version = "0.6.1" @@ -4499,14 +6012,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "base64 0.21.2", - "bytes", + "bytes 1.4.0", "encoding_rs", "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "hyper-rustls 0.24.0", "ipnet", "js-sys", @@ -4515,7 +6028,7 @@ dependencies = [ "mime_guess", "once_cell", "percent-encoding", - "pin-project-lite", + "pin-project-lite 0.2.9", "rustls 0.21.2", "rustls-pemfile", "serde", @@ -4523,10 +6036,12 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-rustls 0.24.1", + "tokio-util 0.7.8", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "webpki-roots 0.22.6", "winreg 0.10.1", @@ -4540,7 +6055,7 @@ checksum = "4531c89d50effe1fac90d095c8b133c20c5c714204feee0bfc3fd158e784209d" dependencies = [ "anyhow", "async-trait", - "http", + "http 0.2.9", "reqwest", "serde", "task-local-extensions", @@ -4557,9 +6072,9 @@ dependencies = [ "async-trait", "chrono", "futures", - "getrandom", - "http", - "hyper", + "getrandom 0.2.10", + "http 0.2.9", + "hyper 0.14.26", "parking_lot 0.11.2", "reqwest", "reqwest-middleware", @@ -4588,7 +6103,7 @@ checksum = "e09bbcb5003282bcb688f0bae741b278e9c7e8f378f561522c9806c58e075d9b" dependencies = [ "anyhow", "chrono", - "rand", + "rand 0.8.5", ] [[package]] @@ -4604,6 +6119,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "rfc7239" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "087317b3cf7eb481f13bd9025d729324b7cd068d6f470e2d76d049e191f5ba47" +dependencies = [ + "uncased", +] + [[package]] name = "rhai" version = "1.13.0" @@ -4611,7 +6135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd29fa1f740be6dc91982013957e08c3c4232d7efcfe19e12da87d50bad47758" dependencies = [ "ahash 0.8.3", - "bitflags", + "bitflags 1.3.2", "instant", "num-traits", "rhai_codegen", @@ -4667,6 +6191,93 @@ dependencies = [ "serde", ] +[[package]] +name = "rocket" +version = "0.5.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58734f7401ae5cfd129685b48f61182331745b357b96f2367f01aebaf1cc9cc9" +dependencies = [ + "async-stream", + "async-trait", + "atomic", + "binascii", + "bytes 1.4.0", + "either", + "figment", + "futures", + "indexmap", + "is-terminal", + "log", + "memchr", + "multer", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite 0.2.9", + "rand 0.8.5", + "ref-cast", + "rocket_codegen", + "rocket_http", + "serde", + "state", + "tempfile", + "time 0.3.22", + "tokio", + "tokio-stream", + "tokio-util 0.7.8", + "ubyte", + "version_check", + "yansi", +] + +[[package]] +name = "rocket_codegen" +version = "0.5.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7093353f14228c744982e409259fb54878ba9563d08214f2d880d59ff2fc508b" +dependencies = [ + "devise", + "glob", + "indexmap", + "proc-macro2", + "quote", + "rocket_http", + "syn 2.0.18", + "unicode-xid", +] + +[[package]] +name = "rocket_http" +version = "0.5.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936012c99162a03a67f37f9836d5f938f662e26f2717809761a9ac46432090f4" +dependencies = [ + "cookie 0.17.0", + "either", + "futures", + "http 0.2.9", + "hyper 0.14.26", + "indexmap", + "log", + "memchr", + "pear", + "percent-encoding", + "pin-project-lite 0.2.9", + "ref-cast", + "serde", + "smallvec", + "stable-pattern", + "state", + "time 0.3.22", + "tokio", + "uncased", +] + +[[package]] +name = "route-recognizer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56770675ebc04927ded3e60633437841581c285dc6236109ea25fbf3beb7b59e" + [[package]] name = "rust-embed" version = "6.7.0" @@ -4757,7 +6368,7 @@ version = "0.36.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -4771,10 +6382,10 @@ version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", - "itoa", + "itoa 1.0.6", "libc", "linux-raw-sys 0.3.8", "once_cell", @@ -4843,7 +6454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "991ae78d5c4b604c9a419490fdee1c6adfaee3e40ecb97217e02508a91f9550e" dependencies = [ "arrayvec 0.7.4", - "bitflags", + "bitflags 1.3.2", "doc-comment", "finl_unicode", "itertools", @@ -4877,6 +6488,94 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +[[package]] +name = "salvo" +version = "0.41.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa316af992a9ce3a6382c783ed50f80758f4b566dccd55b2d69215f9cc07f5a8" +dependencies = [ + "salvo_core", +] + +[[package]] +name = "salvo-utils" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc5955a5ab06f16e9c12e7572fb9a845571f3c6c6f60f4851e870ff112503b3" +dependencies = [ + "futures-channel", + "futures-util", + "http 0.2.9", + "hyper 1.0.0-rc.3", + "once_cell", + "pin-project-lite 0.2.9", + "socket2 0.4.9", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "salvo_core" +version = "0.41.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01decf622297b157f14f86ef886ff343c61f863cfa756ae01a5c3ef248ca419a" +dependencies = [ + "async-trait", + "base64 0.21.2", + "brotli", + "bytes 1.4.0", + "cookie 0.17.0", + "cruet", + "encoding_rs", + "enumflags2", + "flate2", + "form_urlencoded", + "futures-util", + "headers", + "http 0.2.9", + "http-body-util", + "hyper 1.0.0-rc.3", + "indexmap", + "mime", + "mime_guess", + "multer", + "multimap 0.9.0", + "once_cell", + "parking_lot 0.12.1", + "percent-encoding", + "pin-project", + "regex", + "salvo-utils", + "salvo_macros", + "serde", + "serde_json", + "serde_urlencoded", + "tempfile", + "textnonce", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", + "zstd 0.12.3+zstd.1.5.2", +] + +[[package]] +name = "salvo_macros" +version = "0.41.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520d09421ccaa6fa78c301d10d48554289c81ea9fd765b9d55630a7d7ebce632" +dependencies = [ + "cruet", + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 2.0.18", +] + [[package]] name = "same-file" version = "1.0.6" @@ -4905,6 +6604,12 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.1.0" @@ -4927,7 +6632,7 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -4977,6 +6682,16 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.9" @@ -4997,6 +6712,15 @@ dependencies = [ "syn 2.0.18", ] +[[package]] +name = "serde_fmt" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" +dependencies = [ + "serde", +] + [[package]] name = "serde_json" version = "1.0.97" @@ -5004,7 +6728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" dependencies = [ "indexmap", - "itoa", + "itoa 1.0.6", "ryu", "serde", ] @@ -5018,6 +6742,17 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_qs" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" +dependencies = [ + "percent-encoding", + "serde", + "thiserror", +] + [[package]] name = "serde_repr" version = "0.1.12" @@ -5045,7 +6780,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa", + "itoa 1.0.6", "ryu", "serde", ] @@ -5072,7 +6807,7 @@ dependencies = [ "indexmap", "serde", "serde_json", - "time", + "time 0.3.22", ] [[package]] @@ -5081,12 +6816,44 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ - "darling", + "darling 0.13.4", "proc-macro2", "quote", "syn 1.0.109", ] +[[package]] +name = "serenity" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fd5e7b5858ad96e99d440138f34f5b98e1b959ebcd3a1036203b30e78eb788" +dependencies = [ + "async-trait", + "async-tungstenite", + "base64 0.13.1", + "bitflags 1.3.2", + "bytes 1.4.0", + "cfg-if 1.0.0", + "chrono", + "dashmap", + "flate2", + "futures", + "mime", + "mime_guess", + "parking_lot 0.12.1", + "percent-encoding", + "reqwest", + "rustversion", + "serde", + "serde-value", + "serde_json", + "time 0.3.22", + "tokio", + "tracing", + "typemap_rev", + "url", +] + [[package]] name = "sha-1" version = "0.10.1" @@ -5098,6 +6865,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + [[package]] name = "sha1" version = "0.10.5" @@ -5163,6 +6939,16 @@ dependencies = [ "dirs 4.0.0", ] +[[package]] +name = "shuttle-actix-web" +version = "0.21.0" +dependencies = [ + "actix-web", + "num_cpus", + "shuttle-runtime", + "tokio", +] + [[package]] name = "shuttle-admin" version = "0.21.0" @@ -5190,11 +6976,11 @@ dependencies = [ "axum-extra 0.7.4", "axum-sessions", "clap", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "jsonwebtoken", "opentelemetry", - "rand", + "rand 0.8.5", "ring", "serde", "serde_json", @@ -5209,6 +6995,15 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "shuttle-axum" +version = "0.21.0" +dependencies = [ + "axum", + "shuttle-runtime", + "tokio", +] + [[package]] name = "shuttle-codegen" version = "0.21.0" @@ -5229,16 +7024,16 @@ dependencies = [ "async-trait", "axum", "base64 0.13.1", - "bytes", + "bytes 1.4.0", "cap-std", "chrono", "comfy-table", "crossterm", "headers", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-serde", - "hyper", + "hyper 0.14.26", "jsonwebtoken", "once_cell", "opentelemetry", @@ -5247,7 +7042,7 @@ dependencies = [ "pin-project", "proptest", "prost-types", - "rand", + "rand 0.8.5", "reqwest", "ring", "rmp-serde", @@ -5260,21 +7055,21 @@ dependencies = [ "tokio", "tonic", "tower", - "tower-http 0.4.0", + "tower-http 0.4.1", "tracing", "tracing-fluent-assertions", "tracing-opentelemetry", "tracing-subscriber", "ttl_cache", "utoipa", - "uuid", + "uuid 1.3.4", ] [[package]] name = "shuttle-common-tests" version = "0.21.0" dependencies = [ - "hyper", + "hyper 0.14.26", "shuttle-common", "tower", ] @@ -5286,7 +7081,7 @@ dependencies = [ "anyhow", "async-trait", "axum", - "bytes", + "bytes 1.4.0", "cargo_metadata", "chrono", "clap", @@ -5297,14 +7092,14 @@ dependencies = [ "futures", "hex", "home", - "hyper", + "hyper 0.14.26", "hyper-reverse-proxy", "once_cell", "opentelemetry", "opentelemetry-http", "pipe", "portpicker", - "rand", + "rand 0.8.5", "rmp-serde", "serde", "serde_json", @@ -5320,13 +7115,13 @@ dependencies = [ "toml 0.5.11", "tonic", "tower", - "tower-http 0.4.0", + "tower-http 0.4.1", "tracing", "tracing-opentelemetry", "tracing-subscriber", "utoipa", "utoipa-swagger-ui", - "uuid", + "uuid 1.3.4", ] [[package]] @@ -5344,8 +7139,8 @@ dependencies = [ "colored", "fqdn", "futures", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "hyper-reverse-proxy", "instant-acme", "jsonwebtoken", @@ -5357,7 +7152,7 @@ dependencies = [ "pem", "pin-project", "portpicker", - "rand", + "rand 0.8.5", "rcgen", "reqwest", "ring", @@ -5374,7 +7169,7 @@ dependencies = [ "tokio", "tonic", "tower", - "tower-http 0.4.0", + "tower-http 0.4.1", "tower-sanitize-path", "tracing", "tracing-opentelemetry", @@ -5382,10 +7177,55 @@ dependencies = [ "ttl_cache", "utoipa", "utoipa-swagger-ui", - "uuid", + "uuid 1.3.4", "x509-parser", ] +[[package]] +name = "shuttle-next" +version = "0.21.0" +dependencies = [ + "axum", + "futures-executor", + "http 0.2.9", + "rmp-serde", + "shuttle-codegen", + "shuttle-common", + "tower-service", + "tracing-subscriber", +] + +[[package]] +name = "shuttle-persist" +version = "0.21.0" +dependencies = [ + "async-trait", + "bincode", + "serde", + "shuttle-common", + "shuttle-service", + "thiserror", +] + +[[package]] +name = "shuttle-poem" +version = "0.21.0" +dependencies = [ + "poem", + "shuttle-runtime", + "tokio", +] + +[[package]] +name = "shuttle-poise" +version = "0.21.0" +dependencies = [ + "poise", + "shuttle-runtime", + "shuttle-secrets", + "tokio", +] + [[package]] name = "shuttle-proto" version = "0.21.0" @@ -5416,7 +7256,7 @@ dependencies = [ "once_cell", "portpicker", "prost", - "rand", + "rand 0.8.5", "serde_json", "shuttle-common", "shuttle-proto", @@ -5453,6 +7293,15 @@ dependencies = [ "ulid", ] +[[package]] +name = "shuttle-rocket" +version = "0.21.0" +dependencies = [ + "rocket", + "shuttle-runtime", + "tokio", +] + [[package]] name = "shuttle-runtime" version = "0.21.0" @@ -5463,7 +7312,7 @@ dependencies = [ "chrono", "crossbeam-channel", "futures", - "hyper", + "hyper 0.14.26", "portpicker", "prost-types", "rmp-serde", @@ -5486,6 +7335,36 @@ dependencies = [ "wasmtime-wasi", ] +[[package]] +name = "shuttle-salvo" +version = "0.21.0" +dependencies = [ + "salvo", + "shuttle-runtime", + "tokio", +] + +[[package]] +name = "shuttle-secrets" +version = "0.21.0" +dependencies = [ + "async-trait", + "serde", + "shuttle-service", +] + +[[package]] +name = "shuttle-serenity" +version = "0.21.0" +dependencies = [ + "anyhow", + "serenity", + "shuttle-runtime", + "shuttle-secrets", + "tokio", + "tracing", +] + [[package]] name = "shuttle-service" version = "0.21.0" @@ -5504,6 +7383,58 @@ dependencies = [ "tracing", ] +[[package]] +name = "shuttle-static-folder" +version = "0.21.0" +dependencies = [ + "async-trait", + "dunce", + "fs_extra", + "serde", + "shuttle-service", + "tempfile", + "tokio", + "tracing", +] + +[[package]] +name = "shuttle-thruster" +version = "0.21.0" +dependencies = [ + "shuttle-runtime", + "thruster", + "tokio", +] + +[[package]] +name = "shuttle-tide" +version = "0.21.0" +dependencies = [ + "async-std", + "shuttle-runtime", + "tide", + "tokio", +] + +[[package]] +name = "shuttle-tower" +version = "0.21.0" +dependencies = [ + "hyper 0.14.26", + "shuttle-runtime", + "tokio", + "tower", +] + +[[package]] +name = "shuttle-warp" +version = "0.21.0" +dependencies = [ + "shuttle-runtime", + "tokio", + "warp", +] + [[package]] name = "signal-hook" version = "0.3.15" @@ -5534,6 +7465,15 @@ dependencies = [ "libc", ] +[[package]] +name = "simple-mutex" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" +dependencies = [ + "event-listener", +] + [[package]] name = "simple_asn1" version = "0.6.2" @@ -5543,7 +7483,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time", + "time 0.3.22", ] [[package]] @@ -5552,7 +7492,7 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ - "autocfg", + "autocfg 1.1.0", ] [[package]] @@ -5573,7 +7513,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" dependencies = [ - "autocfg", + "autocfg 1.1.0", "static_assertions", "version_check", ] @@ -5653,9 +7593,9 @@ dependencies = [ "ahash 0.7.6", "atoi", "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "byteorder", - "bytes", + "bytes 1.4.0", "chrono", "crc", "crossbeam-queue", @@ -5671,10 +7611,10 @@ dependencies = [ "futures-util", "hashlink", "hex", - "hkdf", + "hkdf 0.12.3", "hmac 0.12.1", "indexmap", - "itoa", + "itoa 1.0.6", "libc", "libsqlite3-sys", "log", @@ -5683,12 +7623,12 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rand", + "rand 0.8.5", "rustls 0.20.8", "rustls-pemfile", "serde", "serde_json", - "sha1", + "sha1 0.10.5", "sha2 0.10.7", "smallvec", "sqlformat", @@ -5697,7 +7637,7 @@ dependencies = [ "thiserror", "tokio-stream", "url", - "uuid", + "uuid 1.3.4", "webpki-roots 0.22.6", "whoami", ] @@ -5733,18 +7673,94 @@ dependencies = [ "tokio-rustls 0.23.4", ] +[[package]] +name = "stable-pattern" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045" +dependencies = [ + "memchr", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version 0.2.3", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn 1.0.109", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1 0.6.1", + "syn 1.0.109", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + [[package]] name = "strfmt" version = "0.2.4" @@ -5777,23 +7793,91 @@ dependencies = [ ] [[package]] -name = "strum_macros" -version = "0.24.3" +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "sval" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2faba619276044eec7cd160d87b15d9191fb9b9f7198440343d2144f760cf08" + +[[package]] +name = "sval_buffer" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a353d3cca10721384077c9643c3fafdd6ed2600e57933b8e45c0b580d97b25af" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee5fc7349e9f6cb2ab950046818f66ad3f2d7209ccc5dced93da19292a30273a" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "098fb51d5d6007bd2c3f0a23b79aa953d7c46bf943086ce51424c3187c40f9b1" +dependencies = [ + "itoa 1.0.6", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f01126a2783d767496f18f13af26ab2587881f6343368bb26dc62956a723d1c7" +dependencies = [ + "itoa 1.0.6", + "ryu", + "sval", +] + +[[package]] +name = "sval_ref" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "5854d9eaa7bd31840a850322591c59c5b547eb29c9a6ecee1989d6ef963312ce" dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", + "sval", ] [[package]] -name = "subtle" -version = "2.4.1" +name = "sval_serde" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "8cdd25fc04c5e882787d62112591aa93efb5bdc2000b43164d29f08582bb85f7" +dependencies = [ + "serde", + "sval", + "sval_buffer", + "sval_fmt", +] [[package]] name = "syn" @@ -5841,7 +7925,7 @@ version = "0.25.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "928ebd55ab758962e230f51ca63735c5b283f26292297c81404289cda5d78631" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cap-fs-ext", "cap-std", "fd-lock", @@ -5876,9 +7960,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" [[package]] name = "task-local-extensions" @@ -5902,6 +7986,15 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "templatify" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a528032d6917c9a80cf894d9feeffe34056e8d62d3492bbfc15abfdcfa8a8fe1" +dependencies = [ + "bytes 0.4.12", +] + [[package]] name = "termcolor" version = "1.2.0" @@ -5938,6 +8031,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "textnonce" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f8d70cd784ed1dc33106a18998d77758d281dc40dc3e6d050cf0f5286683" +dependencies = [ + "base64 0.12.3", + "rand 0.7.3", +] + [[package]] name = "thiserror" version = "1.0.40" @@ -5968,18 +8071,113 @@ dependencies = [ "once_cell", ] +[[package]] +name = "thruster" +version = "1.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fc8a25a7daf311b8cf2210742a06c430725140df7e293f0b9fb4f2ce6d967c9" +dependencies = [ + "async-trait", + "bytes 0.5.6", + "bytes 1.4.0", + "fnv", + "futures", + "http 0.1.21", + "http 0.2.9", + "httparse", + "hyper 0.14.26", + "lazy_static", + "log", + "net2", + "num_cpus", + "paste", + "serde", + "serde_derive", + "serde_json", + "smallvec", + "socket2 0.4.9", + "templatify", + "thruster-proc", + "time 0.1.45", + "tokio", + "tokio-stream", + "tokio-util 0.6.10", +] + +[[package]] +name = "thruster-proc" +version = "1.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49a8e5a2bf3e178f2791b27da861c361d6ad649900d0dd5efc5044897267d55" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "syn 2.0.18", + "uuid 0.7.4", +] + +[[package]] +name = "tide" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c459573f0dd2cc734b539047f57489ea875af8ee950860ded20cf93a79a1dee0" +dependencies = [ + "async-h1", + "async-session 2.0.1", + "async-sse", + "async-std", + "async-trait", + "femme", + "futures-util", + "http-client", + "http-types", + "kv-log-macro", + "log", + "pin-project-lite 0.2.9", + "route-recognizer", + "serde", + "serde_json", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros 0.1.1", + "version_check", + "winapi", +] + [[package]] name = "time" version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" dependencies = [ - "itoa", + "itoa 1.0.6", "libc", "num_threads", "serde", "time-core", - "time-macros", + "time-macros 0.2.9", ] [[package]] @@ -5988,6 +8186,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + [[package]] name = "time-macros" version = "0.2.9" @@ -5997,6 +8205,19 @@ dependencies = [ "time-core", ] +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn 1.0.109", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -6027,13 +8248,13 @@ version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ - "autocfg", - "bytes", + "autocfg 1.1.0", + "bytes 1.4.0", "libc", "mio", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite", + "pin-project-lite 0.2.9", "signal-hook-registry", "socket2 0.4.9", "tokio-macros", @@ -6046,7 +8267,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ - "pin-project-lite", + "pin-project-lite 0.2.9", "tokio", ] @@ -6089,7 +8310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite", + "pin-project-lite 0.2.9", "tokio", ] @@ -6100,7 +8321,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" dependencies = [ "async-stream", - "bytes", + "bytes 1.4.0", "futures-core", "tokio", "tokio-stream", @@ -6133,17 +8354,33 @@ dependencies = [ "webpki-roots 0.23.1", ] +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes 1.4.0", + "futures-core", + "futures-io", + "futures-sink", + "log", + "pin-project-lite 0.2.9", + "slab", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ - "bytes", + "bytes 1.4.0", "futures-core", "futures-io", "futures-sink", - "pin-project-lite", + "pin-project-lite 0.2.9", "tokio", "tracing", ] @@ -6155,7 +8392,7 @@ source = "git+https://github.com/shuttle-hq/tokiotest-httpserver?branch=feat/bod dependencies = [ "async-trait", "futures", - "hyper", + "hyper 0.14.26", "lazy_static", "queues", "serde_json", @@ -6236,13 +8473,13 @@ dependencies = [ "async-trait", "axum", "base64 0.13.1", - "bytes", + "bytes 1.4.0", "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "hyper-timeout", "percent-encoding", "pin-project", @@ -6250,7 +8487,7 @@ dependencies = [ "prost-derive", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.7.8", "tower", "tower-layer", "tower-service", @@ -6281,11 +8518,11 @@ dependencies = [ "futures-util", "indexmap", "pin-project", - "pin-project-lite", - "rand", + "pin-project-lite 0.2.9", + "rand 0.8.5", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.8", "tower-layer", "tower-service", "tracing", @@ -6297,14 +8534,14 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" dependencies = [ - "bitflags", - "bytes", + "bitflags 1.3.2", + "bytes 1.4.0", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-range-header", - "pin-project-lite", + "pin-project-lite 0.2.9", "tower-layer", "tower-service", ] @@ -6315,34 +8552,34 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "bitflags", - "bytes", + "bitflags 1.3.2", + "bytes 1.4.0", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-range-header", - "pin-project-lite", + "pin-project-lite 0.2.9", "tower-layer", "tower-service", ] [[package]] name = "tower-http" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" +checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c" dependencies = [ "base64 0.20.0", - "bitflags", - "bytes", + "bitflags 2.3.2", + "bytes 1.4.0", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-range-header", "mime", - "pin-project-lite", + "pin-project-lite 0.2.9", "tower-layer", "tower-service", "tracing", @@ -6360,7 +8597,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f8277387194ad48739f3516a54ef4486927ba53b8d889871f3715fb8f99f5aa" dependencies = [ - "http", + "http 0.2.9", "tower-layer", "tower-service", "url-escape", @@ -6380,7 +8617,7 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite", + "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", ] @@ -6487,7 +8724,7 @@ dependencies = [ "ipnet", "lazy_static", "log", - "rand", + "rand 0.8.5", "smallvec", "thiserror", "tinyvec", @@ -6545,6 +8782,27 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "tungstenite" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +dependencies = [ + "base64 0.13.1", + "byteorder", + "bytes 1.4.0", + "http 0.2.9", + "httparse", + "log", + "rand 0.8.5", + "rustls 0.20.8", + "sha-1", + "thiserror", + "url", + "utf-8", + "webpki", +] + [[package]] name = "tungstenite" version = "0.18.0" @@ -6553,12 +8811,12 @@ checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ "base64 0.13.1", "byteorder", - "bytes", - "http", + "bytes 1.4.0", + "http 0.2.9", "httparse", "log", - "rand", - "sha1", + "rand 0.8.5", + "sha1 0.10.5", "thiserror", "url", "utf-8", @@ -6571,14 +8829,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" dependencies = [ "byteorder", - "bytes", + "bytes 1.4.0", "data-encoding", - "http", + "http 0.2.9", "httparse", "log", - "rand", + "rand 0.8.5", "rustls 0.21.2", - "sha1", + "sha1 0.10.5", "thiserror", "url", "utf-8", @@ -6596,12 +8854,27 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "typemap_rev" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5b74f0a24b5454580a79abb6994393b09adf0ab8070f15827cb666255de155" + [[package]] name = "typenum" version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +[[package]] +name = "ubyte" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6" +dependencies = [ + "serde", +] + [[package]] name = "ucd-trie" version = "0.1.5" @@ -6614,7 +8887,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" dependencies = [ - "rand", + "rand 0.8.5", ] [[package]] @@ -6623,6 +8896,16 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" +[[package]] +name = "uncased" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" +dependencies = [ + "serde", + "version_check", +] + [[package]] name = "unicase" version = "2.6.0" @@ -6683,6 +8966,26 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" +[[package]] +name = "universal-hash" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + [[package]] name = "untrusted" version = "0.7.1" @@ -6698,6 +9001,7 @@ dependencies = [ "form_urlencoded", "idna 0.4.0", "percent-encoding", + "serde", ] [[package]] @@ -6749,7 +9053,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.18", - "uuid", + "uuid 1.3.4", ] [[package]] @@ -6768,13 +9072,22 @@ dependencies = [ "zip", ] +[[package]] +name = "uuid" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" +dependencies = [ + "rand 0.6.5", +] + [[package]] name = "uuid" version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" dependencies = [ - "getrandom", + "getrandom 0.2.10", "serde", ] @@ -6784,6 +9097,42 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "value-bag" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4735c95b4cca1447b448e2e2e87e98d7e7498f4da27e355cf7af02204521001d" +dependencies = [ + "erased-serde", + "serde", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859cb4f0ce7da6a118b559ba74b0e63bf569bea867c20ba457a6b1c886a04e97" +dependencies = [ + "sval", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", +] + [[package]] name = "vcpkg" version = "0.2.15" @@ -6811,6 +9160,12 @@ dependencies = [ "libc", ] +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + [[package]] name = "walkdir" version = "2.3.3" @@ -6830,6 +9185,49 @@ dependencies = [ "try-lock", ] +[[package]] +name = "warp" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba431ef570df1287f7f8b07e376491ad54f84d26ac473489427231e1718e1f69" +dependencies = [ + "bytes 1.4.0", + "futures-channel", + "futures-util", + "headers", + "http 0.2.9", + "hyper 0.14.26", + "log", + "mime", + "mime_guess", + "multer", + "percent-encoding", + "pin-project", + "rustls-pemfile", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-stream", + "tokio-tungstenite 0.18.0", + "tokio-util 0.7.8", + "tower-service", + "tracing", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6867,7 +9265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "474a216b3461220699d5e192ceac8fbc5b489af020760803b5a9d1e030dc8b0f" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "cap-rand", "cap-std", "io-extras", @@ -6887,6 +9285,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", + "serde", + "serde_json", "wasm-bindgen-macro", ] @@ -6955,6 +9355,19 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasm-timer" version = "0.2.5" @@ -7038,7 +9451,7 @@ dependencies = [ "sha2 0.10.7", "toml 0.5.11", "windows-sys 0.45.0", - "zstd", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -7178,7 +9591,7 @@ dependencies = [ "memfd", "memoffset 0.8.0", "paste", - "rand", + "rand 0.8.5", "rustix 0.36.14", "wasmtime-asm-macros", "wasmtime-environ", @@ -7344,7 +9757,7 @@ checksum = "6627da83e9cdf851594a1dcf047573e700ecaa7ce79b70e02f3df5e5d24d0096" dependencies = [ "anyhow", "async-trait", - "bitflags", + "bitflags 1.3.2", "thiserror", "tracing", "wasmtime", @@ -7614,7 +10027,7 @@ version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c52a121f0fbf9320d5f2a9a5d82f6cb7557eda5e8b47fc3e7f359ec866ae960" dependencies = [ - "bitflags", + "bitflags 1.3.2", "io-lifetimes", "windows-sys 0.48.0", ] @@ -7670,7 +10083,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time", + "time 0.3.22", ] [[package]] @@ -7700,7 +10113,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time", + "time 0.3.22", ] [[package]] @@ -7727,7 +10140,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.3+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +dependencies = [ + "zstd-safe 6.0.5+zstd.1.5.4", ] [[package]] @@ -7740,6 +10162,16 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "6.0.5+zstd.1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +dependencies = [ + "libc", + "zstd-sys", +] + [[package]] name = "zstd-sys" version = "2.0.8+zstd.1.5.5" diff --git a/Cargo.toml b/Cargo.toml index e73bcf220..1f9cdf4d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,15 +11,23 @@ members = [ "proto", "provisioner", "resource-recorder", + "resources/persist", + "resources/secrets", + "resources/static-folder", "runtime", "service", + "services/*", ] - exclude = [ "e2e", "examples", - "resources", - "services", + # resources/aws-rds and resources/shared-db have mutually exclusive + # feature flags and are therefore excluded to not conflict in an --all-features test. + "resources/aws-rds", + "resources/shared-db", + # Turso has conflict dependency with sqlx when selecting version of libsqlite3-sys. + # This will be fixed in sqlx 0.7.0 by separating drivers to separate crates. + "resources/turso", ] [workspace.package] @@ -30,11 +38,14 @@ repository = "https://github.com/shuttle-hq/shuttle" # https://doc.rust-lang.org/cargo/reference/workspaces.html#the-workspacedependencies-table [workspace.dependencies] +# libraries shuttle-codegen = { path = "codegen", version = "0.21.0" } shuttle-common = { path = "common", version = "0.21.0" } shuttle-common-tests = { path = "common-tests", version = "0.21.0" } shuttle-proto = { path = "proto", version = "0.21.0" } shuttle-service = { path = "service", version = "0.21.0" } +# used by services/* +shuttle-runtime = { path = "runtime", version = "0.21.0" } anyhow = "1.0.66" async-trait = "0.1.58" @@ -44,13 +55,14 @@ base64 = "0.13.1" bollard = "0.14.0" bytes = "1.3.0" cap-std = "1.0.2" -cargo_metadata = "0.15.3" +cargo_metadata = "0.15.4" chrono = { version = "0.4.23", default-features = false } clap = { version = "4.2.7", features = ["derive"] } crossbeam-channel = "0.5.7" crossterm = "0.26.0" ctor = "0.1.26" dirs = "5.0.0" +dunce = "1.0.4" flate2 = "1.0.25" fqdn = "0.2.3" futures = "0.3.27" @@ -61,6 +73,7 @@ hyper = "0.14.23" # not great, but waiting for WebSocket changes to be merged hyper-reverse-proxy = { git = "https://github.com/chesedo/hyper-reverse-proxy", branch = "bug/host_header" } jsonwebtoken = { version = "8.2.0" } +mongodb = "2.5.0" once_cell = "1.16.0" opentelemetry = { version = "0.19.0", features = ["rt-tokio"] } opentelemetry-http = "0.8.0" diff --git a/cargo-shuttle/Cargo.toml b/cargo-shuttle/Cargo.toml index e03b340d6..57c130183 100644 --- a/cargo-shuttle/Cargo.toml +++ b/cargo-shuttle/Cargo.toml @@ -11,6 +11,7 @@ homepage = "https://www.shuttle.rs" anyhow = { workspace = true } async-trait = { workspace = true } bollard = { workspace = true } +cargo-generate = "0.18.3" cargo_metadata = { workspace = true } chrono = { workspace = true } clap = { workspace = true, features = ["env"] } @@ -19,28 +20,31 @@ crossbeam-channel = { workspace = true } crossterm = { workspace = true } dialoguer = { version = "0.10.4", features = ["fuzzy-select"] } dirs = { workspace = true } -dunce = "1.0.3" +dunce = { workspace = true } flate2 = { workspace = true } futures = { workspace = true } git2 = "0.17.2" home = { workspace = true } headers = { workspace = true } -indicatif = "0.17.3" +indicatif = "0.17.5" ignore = "0.4.20" indoc = "2.0.1" openssl = { version = "0.10", optional = true } portpicker = { workspace = true } reqwest = { workspace = true, features = ["json"] } -reqwest-middleware = "0.2.0" -reqwest-retry = "0.2.0" +reqwest-middleware = "0.2.2" +reqwest-retry = "0.2.2" rmp-serde = { workspace = true } +semver = "1.0.17" serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } sqlx = { workspace = true, features = ["runtime-tokio-rustls", "postgres"] } strum = { workspace = true } tar = { workspace = true } tokio = { workspace = true, features = ["macros", "signal"] } -tokio-tungstenite = { version = "0.19.0", features = ["rustls-tls-webpki-roots"] } +tokio-tungstenite = { version = "0.19.0", features = [ + "rustls-tls-webpki-roots", +] } toml = { workspace = true } toml_edit = { workspace = true } tonic = { workspace = true } @@ -50,11 +54,9 @@ tracing-subscriber = { workspace = true, features = [ "env-filter", "fmt", ] } -url = "2.3.1" +url = "2.4.0" uuid = { workspace = true, features = ["v4"] } -webbrowser = "0.8.2" -semver = "1.0.17" -cargo-generate = "0.18.3" +webbrowser = "0.8.10" [dependencies.shuttle-common] workspace = true @@ -71,7 +73,7 @@ features = ["builder"] vendored-openssl = ["openssl/vendored"] [dev-dependencies] -assert_cmd = "2.0.6" +assert_cmd = "2.0.11" rexpect = "0.5.0" tempfile = { workspace = true } test-context = "0.1.4" diff --git a/deployer/prepare.sh b/deployer/prepare.sh index 9c16662b0..475580991 100755 --- a/deployer/prepare.sh +++ b/deployer/prepare.sh @@ -20,10 +20,12 @@ fi mkdir -p $CARGO_HOME touch $CARGO_HOME/config.toml if [[ $PROD != "true" ]]; then - echo ' - [patch.crates-io] - shuttle-service = { path = "/usr/src/shuttle/service" } + echo '[patch.crates-io] + shuttle-codegen = { path = "/usr/src/shuttle/codegen" } + shuttle-common = { path = "/usr/src/shuttle/common" } + shuttle-proto = { path = "/usr/src/shuttle/proto" } shuttle-runtime = { path = "/usr/src/shuttle/runtime" } + shuttle-service = { path = "/usr/src/shuttle/service" } shuttle-aws-rds = { path = "/usr/src/shuttle/resources/aws-rds" } shuttle-persist = { path = "/usr/src/shuttle/resources/persist" } diff --git a/e2e/tests/integration/helpers/mod.rs b/e2e/tests/integration/helpers/mod.rs index 5467c3fb3..77e6ccbef 100644 --- a/e2e/tests/integration/helpers/mod.rs +++ b/e2e/tests/integration/helpers/mod.rs @@ -33,13 +33,15 @@ impl TempCargoHome { Err(_) => { let dir = Builder::new().prefix("shuttle-tests").tempdir().unwrap(); - // Apply the `patch.crates-io` for `shuttle-service` let mut config = std::fs::File::create(dir.path().join("config.toml")).unwrap(); write!( config, r#"[patch.crates-io] -shuttle-service = {{ path = "{}" }} +shuttle-codegen = {{ path = "{}" }} +shuttle-common = {{ path = "{}" }} +shuttle-proto = {{ path = "{}" }} shuttle-runtime = {{ path = "{}" }} +shuttle-service = {{ path = "{}" }} shuttle-aws-rds = {{ path = "{}" }} shuttle-persist = {{ path = "{}" }} @@ -59,8 +61,11 @@ shuttle-thruster = {{ path = "{}" }} shuttle-tide = {{ path = "{}" }} shuttle-tower = {{ path = "{}" }} shuttle-warp = {{ path = "{}" }}"#, - WORKSPACE_ROOT.join("service").display(), + WORKSPACE_ROOT.join("codegen").display(), + WORKSPACE_ROOT.join("common").display(), + WORKSPACE_ROOT.join("proto").display(), WORKSPACE_ROOT.join("runtime").display(), + WORKSPACE_ROOT.join("service").display(), WORKSPACE_ROOT.join("resources").join("aws-rds").display(), WORKSPACE_ROOT.join("resources").join("persist").display(), WORKSPACE_ROOT.join("resources").join("shared-db").display(), diff --git a/provisioner/Cargo.toml b/provisioner/Cargo.toml index 356caaa6a..76d71cf74 100644 --- a/provisioner/Cargo.toml +++ b/provisioner/Cargo.toml @@ -11,7 +11,7 @@ aws-config = "0.55.2" aws-sdk-rds = "0.27.0" clap = { workspace = true, features = ["env"] } fqdn = { workspace = true } -mongodb = "2.4.0" +mongodb = { workspace = true } prost = { workspace = true } rand = { workspace = true } sqlx = { workspace = true, features = ["postgres", "runtime-tokio-rustls"] } diff --git a/resources/aws-rds/Cargo.toml b/resources/aws-rds/Cargo.toml index f0f3e7816..03c5179e6 100644 --- a/resources/aws-rds/Cargo.toml +++ b/resources/aws-rds/Cargo.toml @@ -10,10 +10,13 @@ keywords = ["shuttle-service", "rds"] async-trait = "0.1.56" paste = "1.0.7" serde = { version = "1.0.148", features = ["derive"] } -shuttle-service = { path = "../../service", version = "0.21.0" } -sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"] } +shuttle-service = { path = "../../service", version = "0.21.0", default-features = false } +sqlx = "0.6.2" [features] -postgres = ["sqlx/postgres"] -mysql = ["sqlx/mysql"] -mariadb = ["sqlx/mysql"] +postgres = ["sqlx/postgres", "sqlx/runtime-tokio-native-tls"] +postgres-rustls = ["sqlx/postgres", "sqlx/runtime-tokio-rustls"] +mysql = ["sqlx/mysql", "sqlx/runtime-tokio-native-tls"] +mysql-rustls = ["sqlx/mysql", "sqlx/runtime-tokio-rustls"] +mariadb = ["sqlx/mysql", "sqlx/runtime-tokio-native-tls"] +mariadb-rustls = ["sqlx/mysql", "sqlx/runtime-tokio-rustls"] diff --git a/resources/aws-rds/README.md b/resources/aws-rds/README.md index cb19123b6..d42078797 100644 --- a/resources/aws-rds/README.md +++ b/resources/aws-rds/README.md @@ -16,6 +16,8 @@ Add `shuttle-aws-rds` to the dependencies for your service. Every engine is behi | MySql | mysql | shuttle_aws_rds::MySql | | MariaDB | mariadb | shuttle_aws_rds::MariaDB | +Note: You can also add `-rustls` after the feature flag, `postgres-rustls` etc + An example using the Tide framework can be found on [GitHub](https://github.com/shuttle-hq/shuttle-examples/tree/main/tide/postgres) ### Options diff --git a/resources/aws-rds/src/lib.rs b/resources/aws-rds/src/lib.rs index aa501f486..7087fbf37 100644 --- a/resources/aws-rds/src/lib.rs +++ b/resources/aws-rds/src/lib.rs @@ -1,4 +1,5 @@ #![doc = include_str!("../README.md")] +#![allow(unused_imports)] use async_trait::async_trait; use paste::paste; diff --git a/resources/persist/Cargo.toml b/resources/persist/Cargo.toml index 4f2be294b..c0d6cad29 100644 --- a/resources/persist/Cargo.toml +++ b/resources/persist/Cargo.toml @@ -1,14 +1,21 @@ [package] name = "shuttle-persist" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Plugin for persist objects" keywords = ["shuttle-service", "persistence"] [dependencies] -async-trait = "0.1.56" +async-trait = { workspace = true } bincode = "1.2.1" -serde = { version = "1.0.0", features = ["derive"] } -shuttle-service = { path = "../../service", version = "0.21.0" } -thiserror = "1.0.32" +serde = { workspace = true, features = ["derive"] } +thiserror = { workspace = true } + +[dependencies.shuttle-common] +workspace = true + +[dependencies.shuttle-service] +workspace = true +default-features = false diff --git a/resources/secrets/Cargo.toml b/resources/secrets/Cargo.toml index d08d09fd0..2c6d1e7f4 100644 --- a/resources/secrets/Cargo.toml +++ b/resources/secrets/Cargo.toml @@ -1,12 +1,16 @@ [package] name = "shuttle-secrets" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Plugin to for managing secrets on shuttle" keywords = ["shuttle-service", "secrets"] [dependencies] -async-trait = "0.1.56" -serde = { version = "1.0.148", features = ["derive"] } -shuttle-service = { path = "../../service", version = "0.21.0" } +async-trait = { workspace = true } +serde = { workspace = true, features = ["derive"] } + +[dependencies.shuttle-service] +workspace = true +default-features = false diff --git a/resources/shared-db/Cargo.toml b/resources/shared-db/Cargo.toml index 11bd21193..c146cf9ce 100644 --- a/resources/shared-db/Cargo.toml +++ b/resources/shared-db/Cargo.toml @@ -7,11 +7,11 @@ description = "Plugin for managing shared databases on shuttle" keywords = ["shuttle-service", "database"] [dependencies] -async-trait = "0.1.56" -mongodb = { version = "2.3.0", optional = true } -serde = { version = "1.0.148", features = ["derive"] } -shuttle-service = { path = "../../service", version = "0.21.0" } -sqlx = { version = "0.6.2", optional = true } +async-trait = "0.1.68" +mongodb = { version = "2.5.0", optional = true } +serde = { version = "1.0.164", features = ["derive"] } +shuttle-service = { path = "../../service", version = "0.21.0", default-features = false } +sqlx = { version = "0.6.3", optional = true } [features] postgres = ["sqlx/postgres", "sqlx/runtime-tokio-native-tls"] diff --git a/resources/static-folder/Cargo.toml b/resources/static-folder/Cargo.toml index b7ce81939..0c81d2d85 100644 --- a/resources/static-folder/Cargo.toml +++ b/resources/static-folder/Cargo.toml @@ -1,18 +1,22 @@ [package] name = "shuttle-static-folder" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Plugin to get a static folder at runtime on shuttle" keywords = ["shuttle-service", "static-folder"] [dependencies] -async-trait = "0.1.56" -dunce = "1.0.3" +async-trait = { workspace = true } +dunce = { workspace = true } fs_extra = "1.3.0" -serde = { version = "1.0.148", features = ["derive"] } -shuttle-service = { path = "../../service", version = "0.21.0" } -tracing = "0.1.37" +serde = { workspace = true, features = ["derive"] } +tracing = { workspace = true } + +[dependencies.shuttle-service] +workspace = true +default-features = false [dev-dependencies] tempfile = "3.3.0" diff --git a/resources/turso/Cargo.toml b/resources/turso/Cargo.toml index 2539e9b16..63dcdb7d3 100644 --- a/resources/turso/Cargo.toml +++ b/resources/turso/Cargo.toml @@ -8,12 +8,11 @@ keywords = ["shuttle-service", "turso"] [dependencies] async-trait = "0.1.56" -libsql-client = { version = "=0.30.1" } +libsql-client = "=0.30.2" serde = { version = "1.0.148", features = ["derive"] } shuttle-service = { path = "../../service", version = "0.21.0", default-features = false } url = { version = "2.3.1", features = ["serde"] } - [dev-dependencies] tempfile = "3.3.0" tokio = "1.28.2" diff --git a/services/shuttle-actix-web/Cargo.toml b/services/shuttle-actix-web/Cargo.toml index 25f065670..ee21dd37e 100644 --- a/services/shuttle-actix-web/Cargo.toml +++ b/services/shuttle-actix-web/Cargo.toml @@ -1,17 +1,18 @@ [package] name = "shuttle-actix-web" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run an actix webserver on shuttle" keywords = ["shuttle-service", "actix"] -[workspace] - [dependencies] -actix-web = { version = "4.3.1" } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } +actix-web = "4.3.1" num_cpus = "1.15.0" +[dependencies.shuttle-runtime] +workspace = true + [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } diff --git a/services/shuttle-axum/Cargo.toml b/services/shuttle-axum/Cargo.toml index 5a731569e..3b0883602 100644 --- a/services/shuttle-axum/Cargo.toml +++ b/services/shuttle-axum/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "shuttle-axum" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run an axum webserver on shuttle" keywords = ["shuttle-service", "axum"] -[workspace] - [dependencies] -axum = { version = "0.6.10" } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } +axum = "0.6.18" + +[dependencies.shuttle-runtime] +workspace = true [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } diff --git a/services/shuttle-next/Cargo.toml b/services/shuttle-next/Cargo.toml index 3d2eaebd6..72113d7ea 100644 --- a/services/shuttle-next/Cargo.toml +++ b/services/shuttle-next/Cargo.toml @@ -1,13 +1,12 @@ [package] name = "shuttle-next" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Macros and aliases to deploy wasm on the shuttle platform (https://www.shuttle.rs/)" homepage = "https://www.shuttle.rs" -[workspace] - [lib] [dependencies] @@ -18,6 +17,12 @@ futures-executor = "0.3.21" http = "0.2.7" rmp-serde = "1.1.1" tower-service = "0.3.1" -shuttle-common = { path = "../../common", version = "0.21.0", features = ["wasm"] } -shuttle-codegen = { path = "../../codegen", version = "0.21.0", features = ["next"] } tracing-subscriber = { version = "0.3.16", default-features = false, features = ["registry", "std"] } + +[dependencies.shuttle-codegen] +workspace = true +features = ["next"] + +[dependencies.shuttle-common] +workspace = true +features = ["wasm"] diff --git a/services/shuttle-poem/Cargo.toml b/services/shuttle-poem/Cargo.toml index 4ac9f64c4..e309278c1 100644 --- a/services/shuttle-poem/Cargo.toml +++ b/services/shuttle-poem/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "shuttle-poem" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a poem webserver on shuttle" keywords = ["shuttle-service", "poem"] -[workspace] - [dependencies] -poem = { version = "1.3.55" } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } +poem = "1.3.56" + +[dependencies.shuttle-runtime] +workspace = true [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } diff --git a/services/shuttle-poise/Cargo.toml b/services/shuttle-poise/Cargo.toml index 72f7c2540..535309eff 100644 --- a/services/shuttle-poise/Cargo.toml +++ b/services/shuttle-poise/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "shuttle-poise" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a poise discord bot on shuttle" keywords = ["shuttle-service", "poise", "discord-bot", "serenity"] -[workspace] - [dependencies] -poise = { version = "0.5.2" } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } +poise = "0.5.5" + +[dependencies.shuttle-runtime] +workspace = true [dev-dependencies] shuttle-secrets = { path = "../../resources/secrets" } diff --git a/services/shuttle-rocket/Cargo.toml b/services/shuttle-rocket/Cargo.toml index 7f3c5bfab..2fb943f5b 100644 --- a/services/shuttle-rocket/Cargo.toml +++ b/services/shuttle-rocket/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "shuttle-rocket" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a rocket webserver on shuttle" keywords = ["shuttle-service", "rocket"] -[workspace] - [dependencies] -rocket = { version = "0.5.0-rc.2" } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } +rocket = "0.5.0-rc.3" + +[dependencies.shuttle-runtime] +workspace = true [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } diff --git a/services/shuttle-salvo/Cargo.toml b/services/shuttle-salvo/Cargo.toml index dfbd4715e..ac2df2240 100644 --- a/services/shuttle-salvo/Cargo.toml +++ b/services/shuttle-salvo/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "shuttle-salvo" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a salvo webserver on shuttle" keywords = ["shuttle-service", "salvo"] -[workspace] - [dependencies] -salvo = { version = "0.41.0" } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } +salvo = "0.41.0" + +[dependencies.shuttle-runtime] +workspace = true [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } diff --git a/services/shuttle-serenity/Cargo.toml b/services/shuttle-serenity/Cargo.toml index 27b42ddf4..1a98f1f3d 100644 --- a/services/shuttle-serenity/Cargo.toml +++ b/services/shuttle-serenity/Cargo.toml @@ -1,19 +1,20 @@ [package] name = "shuttle-serenity" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a serenity server on shuttle" keywords = ["shuttle-service", "serenity"] -[workspace] - [dependencies] serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } + +[dependencies.shuttle-runtime] +workspace = true [dev-dependencies] -anyhow = "1.0.69" +anyhow = { workspace = true } shuttle-secrets = { path = "../../resources/secrets" } tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } -tracing = "0.1.37" +tracing = { workspace = true } diff --git a/services/shuttle-thruster/Cargo.toml b/services/shuttle-thruster/Cargo.toml index 9f352cbeb..c6be6f974 100644 --- a/services/shuttle-thruster/Cargo.toml +++ b/services/shuttle-thruster/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "shuttle-thruster" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a thruster webserver on shuttle" keywords = ["shuttle-service", "thruster"] -[workspace] - [dependencies] thruster = { version = "1.3.0" } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } + +[dependencies.shuttle-runtime] +workspace = true [dev-dependencies] thruster = { version = "1.3.0", features = ["hyper_server"] } diff --git a/services/shuttle-tide/Cargo.toml b/services/shuttle-tide/Cargo.toml index 68ffa9aee..16421a386 100644 --- a/services/shuttle-tide/Cargo.toml +++ b/services/shuttle-tide/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "shuttle-tide" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a tide webserver on shuttle" keywords = ["shuttle-service", "tide"] -[workspace] - [dependencies] -tide = { version = "0.16.0" } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } +tide = "0.16.0" + +[dependencies.shuttle-runtime] +workspace = true # Tide does not have tokio support. So make sure async-std is compatible with tokio # https://github.com/http-rs/tide/issues/791 diff --git a/services/shuttle-tower/Cargo.toml b/services/shuttle-tower/Cargo.toml index 4232bbd47..1de41415e 100644 --- a/services/shuttle-tower/Cargo.toml +++ b/services/shuttle-tower/Cargo.toml @@ -1,17 +1,18 @@ [package] name = "shuttle-tower" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a tower webserver on shuttle" keywords = ["shuttle-service", "tower"] -[workspace] - [dependencies] -hyper = { version = "0.14.23", features = ["server", "tcp", "http1"] } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } -tower = { version = "0.4.13", features = ["make"] } +hyper = { workspace = true, features = ["server", "tcp", "http1"] } +tower = { workspace = true, features = ["make"] } + +[dependencies.shuttle-runtime] +workspace = true [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } diff --git a/services/shuttle-warp/Cargo.toml b/services/shuttle-warp/Cargo.toml index 557f72867..8fa8d6e3c 100644 --- a/services/shuttle-warp/Cargo.toml +++ b/services/shuttle-warp/Cargo.toml @@ -1,16 +1,17 @@ [package] name = "shuttle-warp" version = "0.21.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a warp webserver on shuttle" keywords = ["shuttle-service", "warp"] -[workspace] - [dependencies] -warp = { version = "0.3.3" } -shuttle-runtime = { path = "../../runtime", version = "0.21.0" } +warp = "0.3.5" + +[dependencies.shuttle-runtime] +workspace = true [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] }