Skip to content

Commit 5c63b12

Browse files
committed
chore: apply clippy suggestions
1 parent cb201e8 commit 5c63b12

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

testcontainers/src/core/client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,10 +504,10 @@ where
504504
message,
505505
} => io::Error::new(
506506
io::ErrorKind::UnexpectedEof,
507-
format!("Docker container has been dropped: {}", message),
507+
format!("Docker container has been dropped: {message}"),
508508
),
509509
bollard::errors::Error::IOError { err } => err,
510-
err => io::Error::new(io::ErrorKind::Other, err),
510+
err => io::Error::other(err),
511511
})
512512
.boxed();
513513
LogStream::new(stream)

testcontainers/src/core/containers/async_container.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ where
183183
let network_settings = self.docker_client.inspect_network(&network_mode).await?;
184184

185185
network_settings.driver.ok_or_else(|| {
186-
TestcontainersError::other(format!("network {} is not in bridge mode", network_mode))
186+
TestcontainersError::other(format!("network {network_mode} is not in bridge mode"))
187187
})?;
188188

189189
let container_network_settings = container_settings

testcontainers/src/core/logs/consumer/logging_consumer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ impl LoggingConsumer {
4747
let message = message.trim_end_matches(['\n', '\r']);
4848

4949
if let Some(prefix) = &self.prefix {
50-
Cow::Owned(format!("{} {}", prefix, message))
50+
Cow::Owned(format!("{prefix} {message}"))
5151
} else {
5252
Cow::Borrowed(message)
5353
}

testcontainers/src/core/logs/stream.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,8 @@ impl LogStream {
7979
}
8080
Err(err) => {
8181
let err = Arc::new(err);
82-
handle_error!(
83-
stdout_tx.send(Err(io::Error::new(io::ErrorKind::Other, err.clone())))
84-
);
85-
handle_error!(
86-
stderr_tx.send(Err(io::Error::new(io::ErrorKind::Other, err)))
87-
);
82+
handle_error!(stdout_tx.send(Err(io::Error::other(err.clone()))));
83+
handle_error!(stderr_tx.send(Err(io::Error::other(err))));
8884
}
8985
}
9086
}

testcontainers/src/core/wait/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub enum WaitFor {
4141
/// Wait for a certain HTTP response.
4242
#[cfg(feature = "http_wait")]
4343
#[cfg_attr(docsrs, doc(cfg(feature = "http_wait")))]
44-
Http(HttpWaitStrategy),
44+
Http(Box<HttpWaitStrategy>),
4545
/// Wait for the container to exit.
4646
Exit(ExitWaitStrategy),
4747
}
@@ -74,7 +74,7 @@ impl WaitFor {
7474
#[cfg(feature = "http_wait")]
7575
#[cfg_attr(docsrs, doc(cfg(feature = "http_wait")))]
7676
pub fn http(http_strategy: HttpWaitStrategy) -> WaitFor {
77-
WaitFor::Http(http_strategy)
77+
WaitFor::Http(Box::new(http_strategy))
7878
}
7979

8080
/// Wait for the container to exit.
@@ -121,7 +121,7 @@ impl WaitFor {
121121
#[cfg_attr(docsrs, doc(cfg(feature = "http_wait")))]
122122
impl From<HttpWaitStrategy> for WaitFor {
123123
fn from(value: HttpWaitStrategy) -> Self {
124-
Self::Http(value)
124+
Self::Http(Box::new(value))
125125
}
126126
}
127127

0 commit comments

Comments
 (0)