diff --git a/Cargo.lock b/Cargo.lock index 54979bf..3ecc7ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -182,17 +182,6 @@ version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" -[[package]] -name = "async-trait" -version = "0.1.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -305,11 +294,10 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "deadpool" -version = "0.10.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" +checksum = "5ed5957ff93768adf7a65ab167a17835c3d2c3c50d084fe305174c112f468e2f" dependencies = [ - "async-trait", "deadpool-runtime", "num_cpus", "tokio", @@ -2008,7 +1996,6 @@ dependencies = [ "actix-rt", "assert-json-diff", "async-std", - "async-trait", "base64", "deadpool", "futures", diff --git a/Cargo.toml b/Cargo.toml index df81162..5b6856b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,27 +23,26 @@ log = "0.4" serde_json = "1" serde = "1" regex = "1" -futures = "0.3.5" -http = "1.0" +futures = "0.3.31" +http = "1.3" http-body-util = "0.1" -hyper = { version = "1.0", features = ["full"] } +hyper = { version = "1.7", features = ["full"] } hyper-util = { version = "0.1", features = [ "tokio", "server", "http1", "http2", ] } -tokio = { version = "1.5.0", features = ["rt", "macros", "net"] } -deadpool = "0.10.0" -async-trait = "0.1" +tokio = { version = "1.47.1", features = ["rt", "macros", "net"] } +deadpool = "0.12.2" once_cell = "1" -assert-json-diff = "2.0.1" +assert-json-diff = "2.0.2" base64 = "0.22" -url = "2.2" +url = "2.5" [dev-dependencies] -async-std = { version = "1.13.0", features = ["attributes", "tokio1"] } -reqwest = { version = "0.12.7", features = ["json"] } -tokio = { version = "1.5.0", features = ["macros", "rt-multi-thread"] } -actix-rt = "2.2.0" +async-std = { version = "1.13.2", features = ["attributes", "tokio1"] } +reqwest = { version = "0.12.23", features = ["json"] } +tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread"] } +actix-rt = "2.10.0" serde = { version = "1", features = ["derive"] } diff --git a/src/mock_server/pool.rs b/src/mock_server/pool.rs index 36d1f42..1cbf5f2 100644 --- a/src/mock_server/pool.rs +++ b/src/mock_server/pool.rs @@ -1,6 +1,5 @@ use crate::MockServer; use crate::mock_server::bare_server::BareMockServer; -use async_trait::async_trait; use deadpool::managed::{Metrics, Object, Pool}; use once_cell::sync::Lazy; use std::convert::Infallible; @@ -52,7 +51,6 @@ pub(crate) async fn get_pooled_mock_server() -> PooledMockServer { #[derive(Debug)] pub(crate) struct MockServerPoolManager; -#[async_trait] impl deadpool::managed::Manager for MockServerPoolManager { type Error = Infallible; type Type = BareMockServer;