refactor

fjall-rs · Aug 11, 2024 · 3ba2e26 · 3ba2e26
1 parent 57a1b39
commit 3ba2e26
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/src/blob_tree/mod.rs b/src/blob_tree/mod.rs
@@ -3,7 +3,6 @@ mod gc;
 pub mod index;
 pub mod value;
 
-use self::value::MaybeInlineValue;
 use crate::{
     export::import_tree,
     file::BLOBS_FOLDER,
@@ -22,6 +21,7 @@ use std::{
     path::Path,
     sync::{Arc, RwLockWriteGuard},
 };
+use value::MaybeInlineValue;
 use value_log::ValueLog;
 
 fn resolve_value_handle(vlog: &ValueLog<MyCompressor>, item: RangeItem) -> RangeItem {

diff --git a/src/levels/mod.rs b/src/levels/mod.rs
@@ -1,7 +1,6 @@
 pub mod iter;
 mod level;
 
-use self::level::Level;
 use crate::{
     file::rewrite_atomic,
     segment::{meta::SegmentId, Segment},
@@ -10,6 +9,7 @@ use crate::{
 };
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use iter::LevelManifestIterator;
+use level::Level;
 use std::{
     collections::{HashMap, HashSet},
     io::{Cursor, Read, Write},

diff --git a/src/segment/block_index/block_handle.rs b/src/segment/block_index/block_handle.rs
@@ -1,7 +1,9 @@
-use crate::segment::block::ItemSize;
-use crate::serde::{Deserializable, Serializable};
-use crate::value::UserKey;
-use crate::Slice;
+use crate::{
+    segment::block::ItemSize,
+    serde::{Deserializable, Serializable},
+    value::UserKey,
+    Slice,
+};
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use std::io::{Read, Write};
 

diff --git a/src/segment/block_index/mod.rs b/src/segment/block_index/mod.rs
@@ -3,9 +3,8 @@ pub mod top_level;
 pub mod two_level_index;
 pub mod writer;
 
-use self::block_handle::KeyedBlockHandle;
-use super::block::Block;
-use super::value_block::CachePolicy;
+use super::{block::Block, value_block::CachePolicy};
+use block_handle::KeyedBlockHandle;
 
 pub type IndexBlock = Block<KeyedBlockHandle>;
 

diff --git a/src/segment/block_index/two_level_index.rs b/src/segment/block_index/two_level_index.rs
@@ -1,12 +1,11 @@
-use self::super::block_handle::KeyedBlockHandle;
-use super::super::id::GlobalSegmentId;
-use super::super::value_block::CachePolicy;
-use super::top_level::TopLevelIndex;
-use super::{BlockIndex, IndexBlock};
-use crate::block_cache::BlockCache;
-use crate::descriptor_table::FileDescriptorTable;
-use std::path::Path;
-use std::sync::Arc;
+use super::{
+    super::{id::GlobalSegmentId, value_block::CachePolicy},
+    block_handle::KeyedBlockHandle,
+    top_level::TopLevelIndex,
+    BlockIndex, IndexBlock,
+};
+use crate::{block_cache::BlockCache, descriptor_table::FileDescriptorTable};
+use std::{path::Path, sync::Arc};
 
 /// Allows reading index blocks - just a wrapper around a block cache
 #[allow(clippy::module_name_repetitions)]

diff --git a/src/segment/mod.rs b/src/segment/mod.rs
@@ -12,7 +12,6 @@ pub mod value_block;
 pub mod value_block_consumer;
 pub mod writer;
 
-use self::{file_offsets::FileOffsets, range::Range};
 use crate::{
     block_cache::BlockCache,
     descriptor_table::FileDescriptorTable,
@@ -24,6 +23,8 @@ use crate::{
 };
 use block::checksum::Checksum;
 use block_index::two_level_index::TwoLevelBlockIndex;
+use file_offsets::FileOffsets;
+use range::Range;
 use std::{ops::Bound, path::Path, sync::Arc};
 
 #[cfg(feature = "bloom")]