Edition 2018

Author: Keats

Cargo.toml

@@ -3,6 +3,7 @@ name = "mmap-bitvec"
 version = "0.3.0"
 authors = ["Roderick Bovee <roderick@onecodex.com>"]
 autobenches = false
+edition = "2018"
 
 [dependencies]
 memmap = "0.7.0"

benches/benchmark.rs

@@ -1,6 +1,6 @@
+extern crate criterion;
 extern crate memmap;
 extern crate mmap_bitvec;
-extern crate criterion;
 
 use std::fs::OpenOptions;
 use std::mem::transmute;
@@ -9,7 +9,7 @@ use std::ops::Range;
 use memmap::{MmapMut, MmapOptions};
 use mmap_bitvec::{BitVector, MmapBitVec};
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{criterion_group, criterion_main, Criterion};
 
 type BitVecSlice = u64;
 const BIT_VEC_SLICE_SIZE: u8 = 64;
@@ -152,9 +152,11 @@ fn bench_get_range_actual() {
 
 fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("get_range_actual", |b| b.iter(|| bench_get_range_actual()));
-    c.bench_function("get_range_simplified", |b| b.iter(|| bench_get_range_simplified()));
+    c.bench_function("get_range_simplified", |b| {
+        b.iter(|| bench_get_range_simplified())
+    });
     c.bench_function("get_range", |b| b.iter(|| bench_get_range()));
 }
 
 criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);
+criterion_main!(benches);

src/bloom.rs

@@ -4,8 +4,8 @@ use std::path::Path;
 
 use murmurhash3::murmurhash3_x64_128;
 
-use bitvec::BitVector;
-use mmap_bitvec::MmapBitVec;
+use crate::bitvec::BitVector;
+use crate::mmap_bitvec::MmapBitVec;
 
 // we don't want to use murmurhash3::Murmur3Hasher b/c it makes copies of the
 // bytes to be hashed with every single `hash` call

src/lib.rs

@@ -1,17 +1,15 @@
 //! mmap-bitvec is a library for using file-backed (via mmap) bit vectors and
 //! includes common convenience functions and a few data structures built atop
 //! the included bit vector implementation.
-extern crate memmap;
-extern crate murmurhash3;
 
 pub mod bitvec;
 pub mod bloom;
 pub mod combinatorial;
 pub mod mmap_bitvec;
 
+#[doc(inline)]
+pub use crate::mmap_bitvec::MmapBitVec;
 #[doc(inline)]
 pub use bitvec::BitVector;
 #[doc(inline)]
 pub use bloom::BloomFilter;
-#[doc(inline)]
-pub use mmap_bitvec::MmapBitVec;

src/mmap_bitvec.rs

@@ -7,7 +7,7 @@ use std::path::Path;
 
 use memmap::{Mmap, MmapMut, MmapOptions};
 
-use bitvec::BitVector;
+use crate::bitvec::BitVector;
 
 /// Really annoying we have to mock over both of these rather than memmap
 /// just providing support.
@@ -642,7 +642,7 @@ mod test {
     use std::path::Path;
 
     use super::MmapBitVec;
-    use bitvec::BitVector;
+    use crate::bitvec::BitVector;
 
     #[test]
     fn test_bitvec() {