Skip to content

Commit

Permalink
Fix format, imports
Browse files Browse the repository at this point in the history
  • Loading branch information
blaenk committed Jul 28, 2024
1 parent 86dec17 commit 58a8ce1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
25 changes: 13 additions & 12 deletions testcontainers/src/core/client.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
use crate::core::{
client::exec::ExecResult,
env,
env::ConfigurationError,
logs::{
stream::{LogStream, RawLogStream},
LogFrame, LogSource, WaitingStreamWrapper,
},
ports::{PortMappingError, Ports},
};
use std::{io, str::FromStr};

use bollard::{
auth::DockerCredentials,
container::{Config, CreateContainerOptions, LogOutput, LogsOptions, RemoveContainerOptions},
Expand All @@ -19,11 +11,20 @@ use bollard::{
};
use bollard_stubs::models::{ContainerInspectResponse, ExecInspectResponse, Network};
use futures::{StreamExt, TryStreamExt};
use std::io;
use std::str::FromStr;
use tokio::sync::OnceCell;
use url::Url;

use crate::core::{
client::exec::ExecResult,
env,
env::ConfigurationError,
logs::{
stream::{LogStream, RawLogStream},
LogFrame, LogSource, WaitingStreamWrapper,
},
ports::{PortMappingError, Ports},
};

mod bollard_client;
mod exec;
mod factory;
Expand Down
6 changes: 3 additions & 3 deletions testcontainers/src/core/client/bollard_client.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::str::FromStr;
use std::time::Duration;
use std::{str::FromStr, time::Duration};

use crate::core::env;
use bollard::{Docker, API_DEFAULT_VERSION};
use url::Url;

use crate::core::env;

const DEFAULT_TIMEOUT: Duration = Duration::from_secs(2 * 60);

pub(super) fn init(config: &env::Config) -> Result<Docker, bollard::errors::Error> {
Expand Down

0 comments on commit 58a8ce1

Please sign in to comment.