Skip to content

Commit

Permalink
cleaning up use statements
Browse files Browse the repository at this point in the history
  • Loading branch information
rstade committed Mar 24, 2019
1 parent 755f798 commit 5663cb6
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 12 deletions.
3 changes: 1 addition & 2 deletions src/bin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ use e2d2::config::{basic_opts, read_matches};
use e2d2::interface::{ PortType, PmdPort};
use e2d2::native::zcsi::*;
use e2d2::scheduler::{initialize_system, NetBricksContext, StandaloneScheduler};
use e2d2::allocators::CacheAligned;

use std::collections::{HashSet, HashMap};
use std::collections::{HashMap};
use std::env;
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, Ordering};
Expand Down
1 change: 0 additions & 1 deletion src/cmanager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use std::cell::RefCell;
use std::rc::Rc;

use e2d2::headers::TcpHeader;
use e2d2::allocators::CacheAligned;
use e2d2::interface::{PortQueue, L4Flow, Packet};
use e2d2::common::EmptyMetadata;
use e2d2::utils;
Expand Down
7 changes: 3 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,12 @@ use separator::Separatable;

use e2d2::common::ErrorKind as E2d2ErrorKind;
use e2d2::scheduler::*;
use e2d2::allocators::CacheAligned;
use e2d2::interface::{PortQueue, PmdPort, FlowDirector};
use e2d2::interface::{PmdPort, FlowDirector};

use netfcts::errors::*;
use netfcts::io::print_hard_statistics;
use nftcp::setup_delayed_proxy;
use netfcts::{is_kni_core, setup_kni, new_port_queues_for_core, FlowSteeringMode};
use netfcts::{setup_kni, new_port_queues_for_core, FlowSteeringMode};
use netfcts::comm::{MessageFrom, MessageTo, PipelineId};
use netfcts::system::SystemData;
use netfcts::tcp_common::{L234Data, UserData};
Expand All @@ -46,7 +45,7 @@ use std::fs::File;
use std::io::Read;
use std::any::Any;
use std::net::Ipv4Addr;
use std::collections::{HashMap, HashSet};
use std::collections::{HashMap, };
use std::sync::Arc;
use std::sync::mpsc::Sender;
use std::sync::mpsc::Receiver;
Expand Down
2 changes: 0 additions & 2 deletions src/nftcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ use {PipelineId, MessageFrom, MessageTo, TaskType};
use Timeouts;
use ProxyRecStore;

use is_kni_core;

const MIN_FRAME_SIZE: usize = 60; // without fcs

const TIMER_WHEEL_RESOLUTION_MS: u64 = 10;
Expand Down
2 changes: 1 addition & 1 deletion tests/client_syn_fin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use std::io::Write;
use std::net::{SocketAddr, TcpStream};
use std::sync::mpsc::channel;
use std::fs::File;
use std::collections::{HashSet, HashMap};
use std::collections::{HashMap};
use std::str::FromStr;
use std::sync::mpsc::RecvTimeoutError;

Expand Down
2 changes: 0 additions & 2 deletions tests/test_tcp_proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ use std::io::{Read, BufWriter, Write};
use std::net::{SocketAddr, TcpListener, TcpStream};
use std::sync::mpsc::channel;
use std::sync::mpsc::RecvTimeoutError;
use std::collections::{HashSet};
use std::fs::File;
use std::str::FromStr;
use std::collections::HashMap;
Expand All @@ -34,7 +33,6 @@ use e2d2::native::zcsi::*;
use e2d2::interface::PmdPort;
use e2d2::scheduler::initialize_system;
use e2d2::scheduler::StandaloneScheduler;
use e2d2::allocators::CacheAligned;

use netfcts::initialize_flowdirector;
use netfcts::tcp_common::{ReleaseCause, TcpStatistics, L234Data, TcpState};
Expand Down

0 comments on commit 5663cb6

Please sign in to comment.