use statement cleanup

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-08-13 12:59:03 +02:00
parent 9d135fe617
commit 367f002ee2
3 changed files with 29 additions and 28 deletions

View File

@ -1,7 +1,11 @@
use failure::*;
use std::convert::TryInto; use std::convert::TryInto;
use failure::*;
use proxmox::tools::io::{ReadExt, WriteExt}; use proxmox::tools::io::{ReadExt, WriteExt};
// FIXME: Move all the magic numbers into a module so we can import super::magic::* instead of
// the everything of everything everywhere.
use super::*; use super::*;
/// Data chunk with positional information /// Data chunk with positional information

View File

@ -1,22 +1,22 @@
use failure::*;
use std::io;
use std::path::{PathBuf, Path};
use std::collections::HashMap; use std::collections::HashMap;
use std::io;
use std::path::{Path, PathBuf};
use std::sync::{Arc, Mutex};
use failure::*;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use std::sync::{Mutex, Arc};
use crate::tools; use super::backup_info::BackupDir;
use crate::config::datastore; use super::chunk_store::{ChunkStore, GarbageCollectionStatus};
use super::chunk_store::*; use super::dynamic_index::{DynamicIndexReader, DynamicIndexWriter};
use super::fixed_index::*; use super::fixed_index::{FixedIndexReader, FixedIndexWriter};
use super::dynamic_index::*;
use super::index::*; use super::index::*;
use super::backup_info::*;
use super::DataChunk; use super::DataChunk;
use crate::config::datastore;
use crate::server::WorkerTask; use crate::server::WorkerTask;
use crate::tools;
lazy_static!{ lazy_static! {
static ref DATASTORE_MAP: Mutex<HashMap<String, Arc<DataStore>>> = Mutex::new(HashMap::new()); static ref DATASTORE_MAP: Mutex<HashMap<String, Arc<DataStore>>> = Mutex::new(HashMap::new());
} }

View File

@ -1,26 +1,23 @@
use failure::*;
use std::convert::TryInto; use std::convert::TryInto;
use std::io::{Seek, SeekFrom};
use crate::tools;
use super::IndexFile;
use super::chunk_stat::*;
use super::chunk_store::*;
use super::read_chunk::*;
use proxmox_protocol::Chunker;
use std::sync::Arc;
use std::io::{Write, BufWriter};
use std::fs::File; use std::fs::File;
use std::path::{Path, PathBuf}; use std::io::{BufWriter, Seek, SeekFrom, Write};
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::path::{Path, PathBuf};
use std::sync::Arc;
use failure::*;
use uuid::Uuid; use uuid::Uuid;
//use chrono::{Local, TimeZone};
use proxmox::tools::io::ReadExt; use proxmox::tools::io::ReadExt;
use proxmox::tools::vec; use proxmox::tools::vec;
use proxmox_protocol::Chunker;
use super::chunk_stat::ChunkStat;
use super::chunk_store::ChunkStore;
use super::read_chunk::ReadChunk;
use super::IndexFile;
use super::{DataChunk, DataChunkBuilder}; use super::{DataChunk, DataChunkBuilder};
use crate::tools;
/// Header format definition for dynamic index files (`.dixd`) /// Header format definition for dynamic index files (`.dixd`)
#[repr(C)] #[repr(C)]