Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 11 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 0 additions & 2 deletions src/mock_server/pool.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down