Forráskód Böngészése

refactor: re-export modules

liujingx 11 hónapja
szülő
commit
dde01f63be

+ 0 - 1
src/ext4/dir.rs

@@ -118,7 +118,6 @@ impl Ext4 {
         let mut offset = 0;
         while offset < BLOCK_SIZE {
             let de: DirEntry = block.read_offset_as(offset);
-            debug!("Dir entry: {} {:?}", de.rec_len(), de.name());
             if !de.unused() && de.compare_name(name) {
                 return Ok(de);
             }

+ 0 - 4
src/ext4_defs/bitmap.rs

@@ -13,10 +13,6 @@ impl<'a> Bitmap<'a> {
         self.0[bit / 8] & (1 << (bit % 8)) == 0
     }
 
-    pub fn is_bit_set(&self, bit: usize) -> bool {
-        !self.is_bit_clear(bit)
-    }
-
     pub fn set_bit(&mut self, bit: usize) {
         self.0[bit / 8] |= 1 << (bit % 8);
     }

+ 1 - 1
src/ext4_defs/block_group.rs

@@ -13,7 +13,7 @@ use super::BlockDevice;
 use super::SuperBlock;
 use crate::constants::*;
 use crate::prelude::*;
-use crate::AsBytes;
+use super::AsBytes;
 
 #[derive(Debug, Default, Clone, Copy)]
 #[repr(C, packed)]

+ 1 - 1
src/ext4_defs/dir_entry.rs

@@ -8,7 +8,7 @@ use super::FileType;
 use super::SuperBlock;
 use crate::constants::*;
 use crate::prelude::*;
-use crate::AsBytes;
+use super::AsBytes;
 
 #[repr(C)]
 #[derive(Clone, Copy)]

+ 0 - 1
src/ext4_defs/mod.rs

@@ -32,7 +32,6 @@ pub use dir_entry::*;
 pub use extent::*;
 pub use file::*;
 pub use inode::*;
-pub use mount_point::*;
 pub use super_block::*;
 
 /// All file types. Also matches the defination in directory entries.

+ 2 - 0
src/ext4_defs/mount_point.rs

@@ -1,3 +1,5 @@
+#![allow(unused)]
+
 use crate::prelude::*;
 
 /// Mount point descriptor

+ 1 - 1
src/ext4_defs/super_block.rs

@@ -7,7 +7,7 @@
 use super::BlockDevice;
 use crate::constants::*;
 use crate::prelude::*;
-use crate::AsBytes;
+use super::AsBytes;
 
 // 结构体表示超级块
 #[repr(C)]

+ 6 - 5
src/lib.rs

@@ -8,8 +8,9 @@ mod ext4_defs;
 mod jbd2;
 mod prelude;
 
-pub use error::*;
-pub use ext4::*;
-pub use ext4_defs::*;
-
-pub use constants::{BLOCK_SIZE, INODE_BLOCK_SIZE};
+pub use constants::{BLOCK_SIZE, EXT4_ROOT_INO, INODE_BLOCK_SIZE};
+pub use error::{ErrCode, Ext4Error};
+pub use ext4::Ext4;
+pub use ext4_defs::{
+    Block, BlockDevice, DirEntry, FileHandler, FileType, Inode, InodeMode, InodeRef, OpenFlags,
+};