From a0368b6ec086c6e88bd813cf216700329a987eed Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Wed, 2 Oct 2024 14:13:28 +0200 Subject: [PATCH] Update deps --- Cargo.lock | 73 +++++++++++++++++--------- Cargo.toml | 10 ++-- src/bots_manager/bot_manager_client.rs | 2 +- 3 files changed, 55 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47c8abc..3a07e48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -109,9 +109,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" dependencies = [ "async-trait", "axum-core", @@ -135,7 +135,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -143,9 +143,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", @@ -156,7 +156,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -180,7 +180,7 @@ dependencies = [ "pin-project", "tokio", "tower 0.4.13", - "tower-http", + "tower-http 0.5.2", ] [[package]] @@ -236,7 +236,7 @@ dependencies = [ "moka", "once_cell", "regex", - "reqwest 0.12.7", + "reqwest 0.12.8", "sentry", "sentry-tracing", "serde", @@ -251,7 +251,7 @@ dependencies = [ "tokio-stream", "tokio-util", "tower 0.5.1", - "tower-http", + "tower-http 0.6.1", "tracing", "tracing-subscriber", "url", @@ -1274,9 +1274,12 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "openssl" @@ -1549,14 +1552,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -1570,13 +1573,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -1587,9 +1590,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" @@ -1636,9 +1639,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", @@ -1836,7 +1839,7 @@ checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066" dependencies = [ "httpdate", "native-tls", - "reqwest 0.12.7", + "reqwest 0.12.8", "sentry-backtrace", "sentry-contexts", "sentry-core", @@ -2254,7 +2257,7 @@ dependencies = [ "tokio-stream", "tokio-util", "tower 0.4.13", - "tower-http", + "tower-http 0.5.2", "url", ] @@ -2497,8 +2500,14 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -2518,6 +2527,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower-http" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower-layer" version = "0.3.3" diff --git a/Cargo.toml b/Cargo.toml index 5d8b529..12bd6a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,24 +6,24 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -once_cell = "1.19.0" +once_cell = "1.20.1" tokio = { version = "1.40.0", features = ["rt-multi-thread", "macros"] } tokio-util = { version = "0.7.12", features = ["compat"] } tokio-stream = "0.1.16" futures = "0.3.30" -axum = "0.7.5" +axum = "0.7.7" axum-prometheus = "0.7.0" tower = "0.5.1" -tower-http = { version = "0.5.2", features = ["trace"] } +tower-http = { version = "0.6.1", features = ["trace"] } tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["env-filter"]} sentry-tracing = "0.34.0" -reqwest = { version = "0.12.7", features = ["json", "stream"] } +reqwest = { version = "0.12.8", features = ["json", "stream"] } serde = { version = "1.0.198", features = ["derive"] } serde_json = "1.0.116" @@ -39,7 +39,7 @@ strum_macros = "0.26.2" base64 = "0.22.1" textwrap = "0.16.1" -regex = "1.10.4" +regex = "1.11.0" chrono = "0.4.38" dateparser = "0.2.1" diff --git a/src/bots_manager/bot_manager_client.rs b/src/bots_manager/bot_manager_client.rs index 85317a3..a588feb 100644 --- a/src/bots_manager/bot_manager_client.rs +++ b/src/bots_manager/bot_manager_client.rs @@ -40,7 +40,7 @@ pub async fn get_bots() -> Result, reqwest::Error> { pub async fn delete_bot(id: u32) -> Result<(), reqwest::Error> { let response = CLIENT - .delete(&format!("{}/{}/", config::CONFIG.manager_url, id)) + .delete(format!("{}/{}/", config::CONFIG.manager_url, id)) .header("Authorization", &config::CONFIG.manager_api_key) .send() .await;