changeset 427:9b3e2c834aac

- cleanup - imports.
author Lewin Bormann <lbo@spheniscida.de>
date Sat, 21 Oct 2017 14:11:13 +0200
parents 8514c86969b7
children f97591199121
files src/db_impl.rs src/db_iter.rs src/key_types.rs src/log.rs src/memtable.rs src/merging_iter.rs src/options.rs src/skipmap.rs src/table_builder.rs src/table_reader.rs src/types.rs src/version_set.rs
diffstat 12 files changed, 10 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/src/db_impl.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/db_impl.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -7,7 +7,7 @@
 
 use cmp::{Cmp, InternalKeyCmp};
 use env::{Env, FileLock};
-use error::{err, Status, StatusCode, Result};
+use error::{err, StatusCode, Result};
 use filter::{BoxedFilterPolicy, InternalFilterPolicy};
 use infolog::Logger;
 use log::{LogReader, LogWriter};
@@ -28,7 +28,7 @@
 use std::cmp::Ordering;
 use std::io::{self, BufWriter, Write};
 use std::mem;
-use std::ops::{DerefMut, Drop};
+use std::ops::Drop;
 use std::path::Path;
 use std::rc::Rc;
 
--- a/src/db_iter.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/db_iter.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -1,6 +1,6 @@
 
 use cmp::Cmp;
-use key_types::{parse_internal_key, truncate_to_userkey, InternalKey, LookupKey, ValueType};
+use key_types::{parse_internal_key, truncate_to_userkey, LookupKey, ValueType};
 use merging_iter::MergingIter;
 use snapshot::Snapshot;
 use types::{Direction, LdbIterator, Shared};
--- a/src/key_types.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/key_types.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -1,4 +1,3 @@
-use options::CompressionType;
 use types::SequenceNumber;
 
 use std::io::Write;
--- a/src/log.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/log.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -5,7 +5,7 @@
 
 use error::{err, StatusCode, Result};
 
-use std::io::{Error, ErrorKind, Read, Write};
+use std::io::{Read, Write};
 
 use crc::crc32;
 use crc::Hasher32;
--- a/src/memtable.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/memtable.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -1,10 +1,8 @@
 use key_types::{LookupKey, UserKey};
 use cmp::{Cmp, MemtableKeyCmp};
-use error::{err, StatusCode, Result};
 use key_types::{parse_internal_key, parse_memtable_key, build_memtable_key, ValueType};
 use types::{current_key_val, LdbIterator, SequenceNumber};
 use skipmap::{SkipMap, SkipMapIter};
-use options::Options;
 
 use std::rc::Rc;
 
--- a/src/merging_iter.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/merging_iter.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -1,5 +1,4 @@
 use cmp::Cmp;
-use options::Options;
 use types::{current_key_val, Direction, LdbIterator};
 
 use std::cmp::Ordering;
--- a/src/options.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/options.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -7,12 +7,10 @@
 use filter;
 use infolog::{self, Logger};
 use mem_env::MemEnv;
-use types::{share, SequenceNumber, Shared};
+use types::{share, Shared};
 
 use std::default::Default;
-use std::io;
 use std::rc::Rc;
-use std::sync::Mutex;
 
 const KB: usize = 1 << 10;
 const MB: usize = KB * KB;
--- a/src/skipmap.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/skipmap.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -1,6 +1,5 @@
 
 use cmp::{Cmp, MemtableKeyCmp};
-use options::Options;
 use types::LdbIterator;
 use rand::{Rng, SeedableRng, StdRng};
 
--- a/src/table_builder.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/table_builder.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -15,7 +15,7 @@
 
 use crc::crc32;
 use crc::Hasher32;
-use integer_encoding::{FixedInt, FixedIntWriter};
+use integer_encoding::FixedIntWriter;
 use snap::Encoder;
 
 pub const FOOTER_LENGTH: usize = 40;
--- a/src/table_reader.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/table_reader.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -1,14 +1,13 @@
 use block::{Block, BlockIter};
 use blockhandle::BlockHandle;
 use cache;
-use cmp::{Cmp, InternalKeyCmp};
+use cmp::InternalKeyCmp;
 use env::RandomAccess;
 use error::Result;
 use filter;
 use filter_block::FilterBlockReader;
 use key_types::InternalKey;
-use log::unmask_crc;
-use options::{self, CompressionType, Options};
+use options::Options;
 use table_block;
 use table_builder::{self, Footer};
 use types::{current_key_val, LdbIterator};
@@ -16,8 +15,7 @@
 use std::cmp::Ordering;
 use std::rc::Rc;
 
-use crc::crc32::{self, Hasher32};
-use integer_encoding::{FixedInt, FixedIntWriter};
+use integer_encoding::FixedIntWriter;
 
 /// Reads the table footer.
 fn read_footer(f: &RandomAccess, size: usize) -> Result<Footer> {
--- a/src/types.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/types.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -4,7 +4,6 @@
 
 use std::cell::RefCell;
 use std::rc::Rc;
-use std::str::FromStr;
 
 pub const NUM_LEVELS: usize = 7;
 
--- a/src/version_set.rs	Sat Oct 21 14:06:57 2017 +0200
+++ b/src/version_set.rs	Sat Oct 21 14:11:13 2017 +0200
@@ -2,7 +2,7 @@
 use cmp::{Cmp, InternalKeyCmp};
 use env::Env;
 use error::{err, Status, StatusCode, Result};
-use key_types::{parse_internal_key, InternalKey, LookupKey, UserKey};
+use key_types::{parse_internal_key, InternalKey, UserKey};
 use log::{LogWriter, LogReader};
 use merging_iter::MergingIter;
 use options::Options;
@@ -15,7 +15,6 @@
 use std::cmp::Ordering;
 use std::collections::HashSet;
 use std::io::Write;
-use std::ops::Deref;
 use std::path::Path;
 use std::rc::Rc;