From 0f0ba72305620ede374a4fc94c2ec61e49c84254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Orhun=20Parmaks=C4=B1z?= Date: Wed, 27 Mar 2024 17:33:23 +0300 Subject: [PATCH] chore(deps): bump shuttle dependencies --- Cargo.lock | 339 ++++------------------------------------------------- Cargo.toml | 4 +- 2 files changed, 26 insertions(+), 317 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 54e8e22..f33578e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -464,8 +464,6 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "serde_json", - "serde_path_to_error", "sync_wrapper", "tower", "tower-layer", @@ -892,12 +890,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - [[package]] name = "dotenvy" version = "0.15.7" @@ -962,12 +954,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - [[package]] name = "flate2" version = "1.0.28" @@ -1104,10 +1090,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -1156,30 +1140,6 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64", - "bytes", - "headers-core", - "http 0.2.11", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http 0.2.11", -] - [[package]] name = "heck" version = "0.4.1" @@ -1242,12 +1202,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - [[package]] name = "httparse" version = "1.8.0" @@ -1456,21 +1410,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonwebtoken" -version = "9.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" -dependencies = [ - "base64", - "js-sys", - "pem", - "ring", - "serde", - "serde_json", - "simple_asn1", -] - [[package]] name = "kqueue" version = "1.0.8" @@ -1693,27 +1632,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.17" @@ -1802,20 +1720,6 @@ dependencies = [ "urlencoding", ] -[[package]] -name = "opentelemetry-appender-tracing" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12c4bd073648dae8ac45cfc81588d74b3dc5f334119ac08567ddcbfe16f2d809" -dependencies = [ - "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "opentelemetry-http" version = "0.10.0" @@ -1828,46 +1732,6 @@ dependencies = [ "opentelemetry", ] -[[package]] -name = "opentelemetry-otlp" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" -dependencies = [ - "async-trait", - "futures-core", - "http 0.2.11", - "opentelemetry", - "opentelemetry-proto", - "opentelemetry-semantic-conventions", - "opentelemetry_sdk", - "prost 0.11.9", - "thiserror", - "tokio", - "tonic 0.9.2", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" -dependencies = [ - "opentelemetry", - "opentelemetry_sdk", - "prost 0.11.9", - "tonic 0.9.2", -] - -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" -dependencies = [ - "opentelemetry", -] - [[package]] name = "opentelemetry_sdk" version = "0.21.1" @@ -1885,10 +1749,7 @@ dependencies = [ "ordered-float", "percent-encoding", "rand", - "serde_json", "thiserror", - "tokio", - "tokio-stream", ] [[package]] @@ -1953,16 +1814,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -[[package]] -name = "pem" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" -dependencies = [ - "base64", - "serde", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -2071,16 +1922,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.3" @@ -2088,20 +1929,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", - "prost-derive 0.12.3", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", + "prost-derive", ] [[package]] @@ -2123,7 +1951,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost 0.12.3", + "prost", ] [[package]] @@ -2340,12 +2168,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc_version" version = "0.4.0" @@ -2390,23 +2212,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustrict" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe3300a40b60e76a856237ad1fe2210da1f40686705a2211688bb5742109a63" -dependencies = [ - "arrayvec", - "bitflags 1.3.2", - "doc-comment", - "finl_unicode", - "itertools 0.10.5", - "lazy_static", - "rustc-hash", - "strsim", - "unicode-normalization", -] - [[package]] name = "rustversion" version = "1.0.14" @@ -2527,16 +2332,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" -dependencies = [ - "itoa", - "serde", -] - [[package]] name = "serde_plain" version = "1.0.2" @@ -2599,9 +2394,9 @@ dependencies = [ [[package]] name = "shuttle-actix-web" -version = "0.35.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca8b5015eaea3b3bc38078936dc21dbc46a352e736319c80e4422a77c31dcc4" +checksum = "a6cc5c406b066c8c6d68d0165abf38c6484acd6121e7d238440fa46d846b777d" dependencies = [ "actix-web", "num_cpus", @@ -2610,9 +2405,9 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.35.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b99c06b8adfb88b971c2bc2662252a6ec85f4e041c7b0add64499fbdfd71b18" +checksum = "bbaaa74ae77edfc5590c87af97bfc15d0aff2db9ff4a5fd891be0a7dd0de8089" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2622,43 +2417,26 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.35.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1ba1b036ce303eba6982c7a9d43021d121ccba84db43c3c264f8bf22b6bdb7" +checksum = "910ae1502f083563f06fee5d5ceb2a8b45f92c67ef7834806880484f15d79bb5" dependencies = [ "anyhow", - "async-trait", - "axum", - "bytes", "chrono", "comfy-table", "crossterm 0.27.0", - "headers", "http 0.2.11", - "http-body", - "hyper", - "jsonwebtoken", "opentelemetry", - "opentelemetry-appender-tracing", "opentelemetry-http", - "opentelemetry-otlp", - "opentelemetry_sdk", "pin-project", - "rustrict", "semver", "serde", "serde_json", - "strum 0.25.0", - "thiserror", - "tokio", - "tonic 0.10.2", + "strum 0.26.2", "tower", - "tower-http", "tracing", - "tracing-core", "tracing-opentelemetry", "tracing-subscriber", - "ttl_cache", "url", "uuid", "zeroize", @@ -2666,22 +2444,22 @@ dependencies = [ [[package]] name = "shuttle-proto" -version = "0.35.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86275eabcc469d6749d4dc2e091f6e120f04fde813cf7002e5dc60158ce571b" +checksum = "ad7aa381187faaa32562c1e3631047b1edd070c055be50a5f32d13a538110fd7" dependencies = [ "futures-core", - "prost 0.12.3", + "prost", "prost-types", "shuttle-common", - "tonic 0.10.2", + "tonic", ] [[package]] name = "shuttle-runtime" -version = "0.35.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e057c62f2f77368591117411e8de4458f6df33d0c157875c96025c2435e0811f" +checksum = "322f013c5058e37bf19a9ad8af35a2ac139605b0cbd941c0d0a009d032e23b73" dependencies = [ "anyhow", "async-trait", @@ -2698,16 +2476,15 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tonic 0.10.2", - "tower", + "tonic", "tracing-subscriber", ] [[package]] name = "shuttle-service" -version = "0.35.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46d7b998a1137b4aa55190549b1ab71c5c834531776358599925ed23c27e4b86" +checksum = "9118dcf5aea64a38a06875a744b6c7daf8aa41e56eb2ecea2a21fb8c42ff7db5" dependencies = [ "anyhow", "async-trait", @@ -2753,18 +2530,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - [[package]] name = "slab" version = "0.4.9" @@ -2826,11 +2591,11 @@ checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ - "strum_macros 0.25.3", + "strum_macros 0.26.2", ] [[package]] @@ -2848,9 +2613,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck", "proc-macro2", @@ -3124,34 +2889,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tonic" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" -dependencies = [ - "async-trait", - "axum", - "base64", - "bytes", - "futures-core", - "futures-util", - "h2", - "http 0.2.11", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.11.9", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic" version = "0.10.2" @@ -3170,7 +2907,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.3", + "prost", "tokio", "tokio-stream", "tower", @@ -3199,25 +2936,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "bitflags 2.4.1", - "bytes", - "futures-core", - "futures-util", - "http 0.2.11", - "http-body", - "http-range-header", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower-layer" version = "0.3.2" @@ -3329,15 +3047,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" -[[package]] -name = "ttl_cache" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4189890526f0168710b6ee65ceaedf1460c48a14318ceec933cb26baa492096a" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "typenum" version = "1.17.0" diff --git a/Cargo.toml b/Cargo.toml index 2669afb..973ebdb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,8 @@ actix-web = { version = "4.4.1" } actix-web-grants = { version = "4.0.3" } actix-multipart = "0.6.1" actix-files = "0.6.5" -shuttle-actix-web = { version = "0.35.1", optional = true } -shuttle-runtime = { version = "0.35.1", optional = true } +shuttle-actix-web = { version = "0.42.0", optional = true } +shuttle-runtime = { version = "0.42.0", optional = true } awc = { version = "3.4.0" } serde = "1.0.196" futures-util = "0.3.30"