diff --git a/src/config/name.rs b/src/config/name.rs index c54ac6f..9490fbe 100644 --- a/src/config/name.rs +++ b/src/config/name.rs @@ -186,7 +186,7 @@ fn validate_name(name: &str) -> bool { #[test] fn test_de() { - use serde_test::{Token, assert_de_tokens, assert_de_tokens_error}; + use serde_test::{assert_de_tokens, assert_de_tokens_error, Token}; assert_de_tokens(&NamespaceName("foo".into()), &[Token::String("foo")]); diff --git a/src/config/source.rs b/src/config/source.rs index 1b292fd..0f185ac 100644 --- a/src/config/source.rs +++ b/src/config/source.rs @@ -114,7 +114,7 @@ pub struct InvalidForwardSource { #[test] fn test_de() { - use serde_test::{Token, assert_de_tokens, assert_de_tokens_error}; + use serde_test::{assert_de_tokens, assert_de_tokens_error, Token}; let addr_str = "127.0.0.1:80"; let addr = SocketAddr::from_str("127.0.0.1:80").unwrap(); diff --git a/src/config/target.rs b/src/config/target.rs index 249b2be..68206c5 100644 --- a/src/config/target.rs +++ b/src/config/target.rs @@ -111,7 +111,7 @@ pub struct InvalidForwardTarget { #[test] fn test_de() { - use serde_test::{Token, assert_de_tokens, assert_de_tokens_error}; + use serde_test::{assert_de_tokens, assert_de_tokens_error, Token}; let addr_str = "127.0.0.1:80"; let addr = SocketAddr::from_str("127.0.0.1:80").unwrap(); diff --git a/src/namespace/handle.rs b/src/namespace/handle.rs index 5a24623..3e73187 100644 --- a/src/namespace/handle.rs +++ b/src/namespace/handle.rs @@ -1,6 +1,6 @@ use crate::namespace::NamespaceEnterError; use nix::errno::Errno; -use nix::sched::{CloneFlags, setns}; +use nix::sched::{setns, CloneFlags}; use std::fs::File; use std::io::Error as IoError; use std::os::fd::{AsFd, AsRawFd, BorrowedFd, OwnedFd, RawFd}; diff --git a/src/namespace/mod.rs b/src/namespace/mod.rs index a1e3e2c..747281b 100644 --- a/src/namespace/mod.rs +++ b/src/namespace/mod.rs @@ -3,14 +3,14 @@ mod raw; mod sysctl; use crate::config::{DeviceName, NamespaceName}; -use crate::link::{LinkError, link_up, move_all_links, move_link_into}; +use crate::link::{link_up, move_all_links, move_link_into, LinkError}; pub use crate::namespace::handle::{NamespaceHandle, NamespaceHandleError}; -use crate::namespace::raw::{NamespaceSetupError, create_network_namespace}; +use crate::namespace::raw::{create_network_namespace, NamespaceSetupError}; use crate::namespace::sysctl::{CtlError, NamespaceCtl}; use either::Either; use nix::errno::Errno; -use nix::mount::{MntFlags, MsFlags, mount, umount2}; -use std::fs::{File, create_dir, read_dir, remove_file}; +use nix::mount::{mount, umount2, MntFlags, MsFlags}; +use std::fs::{create_dir, read_dir, remove_file, File}; use std::io::{Error as IoError, ErrorKind}; use std::iter::empty; use std::os::unix::fs::symlink; diff --git a/src/namespace/raw.rs b/src/namespace/raw.rs index db1c4fb..5cffe5d 100644 --- a/src/namespace/raw.rs +++ b/src/namespace/raw.rs @@ -1,7 +1,7 @@ use nix::errno::Errno; -use nix::sched::{CloneFlags, clone}; +use nix::sched::{clone, CloneFlags}; use nix::sys::signal::Signal; -use nix::sys::wait::{WaitStatus, waitpid}; +use nix::sys::wait::{waitpid, WaitStatus}; use std::path::PathBuf; use thiserror::Error;