--- a/src/block.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/block.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -2,8 +2,8 @@
 
 use std::rc::Rc;
 
-use options::Options;
-use types::SSIterator;
+use crate::options::Options;
+use crate::types::SSIterator;
 
 use integer_encoding::FixedInt;
 use integer_encoding::VarInt;
@@ -303,9 +303,9 @@
 #[cfg(test)]
 mod tests {
     use super::*;
-    use block_builder::BlockBuilder;
-    use test_util::{test_iterator_properties, SSIteratorIter};
-    use types::{current_key_val, SSIterator};
+    use crate::block_builder::BlockBuilder;
+    use crate::test_util::{test_iterator_properties, SSIteratorIter};
+    use crate::types::{current_key_val, SSIterator};
 
     fn get_data() -> Vec<(&'static [u8], &'static [u8])> {
         vec![

--- a/src/block_builder.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/block_builder.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -1,7 +1,7 @@
 use std::cmp::Ordering;
 
-use block::BlockContents;
-use options::Options;
+use crate::block::BlockContents;
+use crate::options::Options;
 
 use integer_encoding::{FixedIntWriter, VarIntWriter};
 

--- a/src/cmp.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/cmp.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -4,13 +4,13 @@
 /// top of an inner comparator)
 pub trait Cmp {
     /// Compare to byte strings, bytewise.
-    fn cmp(&self, &[u8], &[u8]) -> Ordering;
+    fn cmp(&self, _: &[u8], _: &[u8]) -> Ordering;
 
     /// Return the shortest byte string that compares "Greater" to the first argument and "Less" to
     /// the second one.
-    fn find_shortest_sep(&self, &[u8], &[u8]) -> Vec<u8>;
+    fn find_shortest_sep(&self, _: &[u8], _: &[u8]) -> Vec<u8>;
     /// Return the shortest byte string that compares "Greater" to the argument.
-    fn find_short_succ(&self, &[u8]) -> Vec<u8>;
+    fn find_short_succ(&self, _: &[u8]) -> Vec<u8>;
 
     /// A unique identifier for a comparator. A comparator wrapper (like InternalKeyCmp) may
     /// return the id of its inner comparator.

--- a/src/filter_block.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/filter_block.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -1,5 +1,5 @@
-use block::BlockContents;
-use filter::BoxedFilterPolicy;
+use crate::block::BlockContents;
+use crate::filter::BoxedFilterPolicy;
 
 use std::rc::Rc;
 
@@ -167,7 +167,7 @@
     use super::get_filter_index;
     use super::FILTER_BASE_LOG2;
     use super::*;
-    use filter::BloomPolicy;
+    use crate::filter::BloomPolicy;
 
     #[test]
     fn test_filter_index() {

--- a/src/lib.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/lib.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -1,6 +1,3 @@
-extern crate crc;
-extern crate integer_encoding;
-extern crate snap;
 #[cfg(test)]
 #[macro_use]
 extern crate time_test;
@@ -20,12 +17,14 @@
 mod table_builder;
 mod table_reader;
 
-pub use cmp::{Cmp, DefaultCmp};
-pub use error::{Result, Status, StatusCode};
-pub use options::{CompressionType, Options};
-pub use table_builder::TableBuilder;
-pub use table_reader::{Table, TableIterator};
-pub use types::{current_key_val, SSIterator};
+pub use crate::cmp::{Cmp, DefaultCmp};
+pub use crate::error::{Result, Status, StatusCode};
+pub use crate::options::{CompressionType, Options};
+pub use crate::table_builder::TableBuilder;
+pub use crate::table_reader::{Table, TableIterator};
+pub use crate::types::{current_key_val, SSIterator};
 
 #[cfg(test)]
 mod test_util;
+#[cfg(test)]
+mod benchmark;

--- a/src/options.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/options.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -1,8 +1,8 @@
-use block::Block;
-use cache::Cache;
-use cmp::{Cmp, DefaultCmp};
-use filter;
-use types::{share, Shared};
+use crate::block::Block;
+use crate::cache::Cache;
+use crate::cmp::{Cmp, DefaultCmp};
+use crate::filter;
+use crate::types::{share, Shared};
 
 use std::default::Default;
 use std::rc::Rc;

--- a/src/table_block.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/table_block.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -1,11 +1,11 @@
-use block::Block;
-use blockhandle::BlockHandle;
-use error::{err, Result, StatusCode};
-use filter;
-use filter_block::FilterBlockReader;
-use options::{self, CompressionType, Options};
-use table_builder;
-use types::{unmask_crc, RandomAccess};
+use crate::block::Block;
+use crate::blockhandle::BlockHandle;
+use crate::error::{err, Result, StatusCode};
+use crate::filter;
+use crate::filter_block::FilterBlockReader;
+use crate::options::{self, CompressionType, Options};
+use crate::table_builder;
+use crate::types::{unmask_crc, RandomAccess};
 
 use crc::crc32::{self, Hasher32};
 use integer_encoding::FixedInt;

--- a/src/table_builder.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/table_builder.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -1,11 +1,11 @@
-use block::BlockContents;
-use block_builder::BlockBuilder;
-use blockhandle::BlockHandle;
-use error::Result;
-use filter::NoFilterPolicy;
-use filter_block::FilterBlockBuilder;
-use options::{CompressionType, Options};
-use types::mask_crc;
+use crate::block::BlockContents;
+use crate::block_builder::BlockBuilder;
+use crate::blockhandle::BlockHandle;
+use crate::error::Result;
+use crate::filter::NoFilterPolicy;
+use crate::filter_block::FilterBlockBuilder;
+use crate::options::{CompressionType, Options};
+use crate::types::mask_crc;
 
 use std::cmp::Ordering;
 use std::io::Write;
@@ -274,7 +274,7 @@
 #[cfg(test)]
 mod tests {
     use super::*;
-    use blockhandle::BlockHandle;
+    use crate::blockhandle::BlockHandle;
 
     #[test]
     fn test_footer() {

--- a/src/table_reader.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/table_reader.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -1,12 +1,12 @@
-use block::{Block, BlockIter};
-use blockhandle::BlockHandle;
-use cache;
-use error::Result;
-use filter_block::FilterBlockReader;
-use options::Options;
-use table_block;
-use table_builder::{self, Footer};
-use types::{current_key_val, RandomAccess, SSIterator};
+use crate::block::{Block, BlockIter};
+use crate::blockhandle::BlockHandle;
+use crate::cache;
+use crate::error::Result;
+use crate::filter_block::FilterBlockReader;
+use crate::options::Options;
+use crate::table_block;
+use crate::table_builder::{self, Footer};
+use crate::types::{current_key_val, RandomAccess, SSIterator};
 
 use std::cmp::Ordering;
 use std::fs;
@@ -338,10 +338,10 @@
 
 #[cfg(test)]
 mod tests {
-    use options::CompressionType;
-    use table_builder::TableBuilder;
-    use test_util::{test_iterator_properties, SSIteratorIter};
-    use types::{current_key_val, SSIterator};
+    use crate::options::CompressionType;
+    use crate::table_builder::TableBuilder;
+    use crate::test_util::{test_iterator_properties, SSIteratorIter};
+    use crate::types::{current_key_val, SSIterator};
 
     use super::*;
 

--- a/src/test_util.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/test_util.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -1,5 +1,5 @@
-use cmp::{Cmp, DefaultCmp};
-use types::{current_key_val, SSIterator};
+use crate::cmp::{Cmp, DefaultCmp};
+use crate::types::{current_key_val, SSIterator};
 
 use std::cmp::Ordering;
 

--- a/src/types.rs	Mon Feb 17 20:35:19 2020 +0100
+++ b/src/types.rs	Wed Feb 19 15:05:00 2020 +0100
@@ -1,6 +1,6 @@
 //! A collection of fundamental and/or simple types used by other modules. A bit of a grab bag :-)
 
-use error::Result;
+use crate::error::Result;
 
 use std::cell::RefCell;
 use std::fs::File;