Remove not used deps

Author: lukasfrank

src/daemon.rs

@@ -1,4 +1,4 @@
-use log::{debug, error, info, warn};
+use log::{error, info, warn};
 use std::net::Ipv6Addr;
 use std::path::PathBuf;
 use std::{env, io};
@@ -15,22 +15,18 @@ use crate::feos_grpc::{
     ShutdownVmRequest, ShutdownVmResponse,
 };
 use crate::host;
-use crate::isolated_container;
-use crate::radv::start_radv_server;
 use crate::ringbuffer::*;
 use crate::vm::{self};
 use crate::vm::{image, Manager};
 use crate::{container, network};
 use hyper_util::rt::TokioIo;
 use nix::libc::VMADDR_CID_ANY;
 use nix::unistd::Uid;
-use rtnetlink::new_connection;
 use std::sync::Arc;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::net::UnixStream;
-use tokio::spawn;
 use tokio::sync::{mpsc, Mutex};
 use tokio::time::{sleep, Duration};
 use tokio_stream::wrappers::ReceiverStream;

src/isolated_container/mod.rs

@@ -1,37 +1,18 @@
 use crate::container::container_service::container_service_client::ContainerServiceClient;
-use crate::container::container_service::{CreateContainerRequest, RunContainerRequest, StateContainerRequest};
-use crate::daemon::FeOSAPI;
-use crate::feos_grpc::Empty;
-use crate::ringbuffer::RingBuffer;
+use crate::container::container_service::{
+    CreateContainerRequest, RunContainerRequest, StateContainerRequest,
+};
 use crate::vm::{Error, NetworkMode};
-use crate::{container, feos_grpc, network, vm};
-use flate2::read::GzDecoder;
-use futures::channel;
+use crate::{network, vm};
 use hyper_util::rt::TokioIo;
 use isolated_container_service::isolated_container_service_server::IsolatedContainerService;
-use libcontainer::container::builder::ContainerBuilder;
-use libcontainer::container::Container;
-use libcontainer::oci_spec::runtime::{LinuxNamespace, Mount, Spec};
-use libcontainer::signal::Signal;
-use libcontainer::syscall::syscall::SyscallType;
-use libcontainer::workload::default::DefaultExecutor;
-use log::{debug, error, info};
-use rtnetlink::new_connection;
-use serde_json::to_writer_pretty;
-use std::fs;
-use std::fs::File;
-use std::io::BufReader;
-use std::io::{BufWriter, Write};
-use std::path::Path;
+use log::info;
+use std::io::Write;
 use std::sync::Arc;
-use std::thread::sleep;
-use std::{collections::HashMap, num::TryFromIntError, sync::Mutex};
+use std::{collections::HashMap, sync::Mutex};
 use std::{fmt::Debug, io, path::PathBuf, time};
-use tar::Archive;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::UnixStream;
-use tokio::spawn;
-use tokio::sync::mpsc;
 use tonic::transport::{Channel, Endpoint, Uri};
 use tonic::{Request, Response, Status};
 use tower::service_fn;
@@ -255,7 +236,6 @@ impl IsolatedContainerService for IsolatedContainerAPI {
     ) -> Result<Response<isolated_container_service::StopContainerResponse>, Status> {
         info!("Got stop_container request");
 
-
         let container_id: String = request.get_ref().uuid.clone();
         let container_id = Uuid::parse_str(&container_id)
             .map_err(|_| Status::invalid_argument("failed to parse uuid"))?;
@@ -301,15 +281,14 @@ impl IsolatedContainerService for IsolatedContainerAPI {
         let channel = get_channel(path).await.expect("abc");
 
         let mut client = ContainerServiceClient::new(channel);
-        let request = tonic::Request::new( StateContainerRequest {
+        let request = tonic::Request::new(StateContainerRequest {
             uuid: container_id.to_string(),
         });
         let response = client.state_container(request).await?;
 
-
         Ok(Response::new(
             isolated_container_service::StateContainerResponse {
-                state:  response.get_ref().state.to_string(),
+                state: response.get_ref().state.to_string(),
                 pid: response.get_ref().pid,
             },
         ))

src/network/mod.rs

@@ -1,19 +1,11 @@
-use log::{debug, error, info, warn};
-use netlink_packet_route::link::LinkMessage;
-use nix::net::if_::if_nametoindex;
+use log::{debug, error, info};
 use rtnetlink::new_connection;
 use std::collections::HashMap;
 use std::net::Ipv6Addr;
-use std::num::TryFromIntError;
-use std::path::Path;
-use std::process::Child;
 use std::sync::atomic::{AtomicU16, Ordering};
 use std::sync::{Arc, Mutex};
-use tokio::fs::{read_link, OpenOptions};
 use tokio::spawn;
 use tokio::task::JoinHandle;
-use tokio::time::sleep;
-use tonic::Status;
 use uuid::Uuid;
 
 pub mod dhcpv6;
@@ -81,7 +73,7 @@ impl Manager {
 
     pub async fn stop_dhcp(&self, id: Uuid) -> Result<(), Error> {
         let mut instances = self.instances.lock().unwrap();
-        if let Some(handle) = instances.remove(&id)  {
+        if let Some(handle) = instances.remove(&id) {
             handle.radv_handle.abort();
             handle.dhcpv6_handle.abort();
         }

src/vm/mod.rs

@@ -1,4 +1,4 @@
-use log::{error, info};
+use log::info;
 use serde_json::json;
 use std::{
     collections::HashMap,
@@ -14,22 +14,13 @@ use uuid::Uuid;
 use vmm::vm_config;
 
 use vmm::config::{
-    ConsoleConfig, ConsoleOutputMode, CpusConfig, DiskConfig, MemoryConfig, NetConfig,
-    PayloadConfig, PlatformConfig, VsockConfig,
+    ConsoleConfig, ConsoleOutputMode, CpusConfig, DiskConfig, MemoryConfig, PayloadConfig,
+    PlatformConfig, VsockConfig,
 };
 
 use net_util::MacAddr;
 
 use crate::network;
-use pelite::pe64::{Pe, PeFile};
-use std::fs;
-use std::fs::{create_dir_all, File};
-use std::io::{self, Write};
-use std::net::Ipv6Addr;
-use std::sync::atomic::{AtomicU16, Ordering};
-use std::sync::Arc;
-use thiserror::Error;
-use tokio::task::JoinHandle;
 
 pub mod config;
 pub mod image;
@@ -197,7 +188,7 @@ impl Manager {
         //     ..config::_default_net_cfg()
         // }]);
 
-        if disks.len() != 0 {
+        if !disks.is_empty() {
             vm_config.disks = Some(disks);
         }
 
@@ -281,7 +272,7 @@ impl Manager {
 
         let mut socket = UnixStream::connect(id.to_string()).map_err(Error::SocketFailure)?;
 
-        let mut request: (String, String);
+        let request: (String, String);
 
         match config {
             NetworkMode::PCIAddress(pci) => {
@@ -334,7 +325,7 @@ impl Manager {
             )
         }
 
-        return Ok(());
+        Ok(())
     }
 
     pub fn ping_vmm(&self, id: Uuid) -> Result<(), Error> {
@@ -396,23 +387,20 @@ impl Manager {
             info!("shutdown vm: id {}, response: {}", id, x);
         }
 
-
         let response = api_client::simple_api_full_command_and_response(
             &mut socket,
             "PUT",
             "vmm.shutdown",
             None,
         )
-            .map_err(Error::CHApiFailure)?;
+        .map_err(Error::CHApiFailure)?;
 
         if let Some(x) = &response {
             info!("shutdown vmm: id {}, response: {}", id, x);
         }
 
-
         vms.remove(&id);
 
         Ok(String::new())
     }
 }
-