update bitvec to 0.17

Author: wangrunji0408

rcore-fs-sefs/Cargo.toml

@@ -7,13 +7,9 @@ edition = "2018"
 [dependencies]
 rcore-fs = { path = "../rcore-fs" }
 static_assertions = "0.3"
-spin = "0.4"
+spin = "0.5"
 log = "0.4"
-
-[dependencies.bitvec]
-version = "0.9"
-default-features = false
-features = ["alloc"]
+bitvec = { version = "0.17", default-features = false, features = ["alloc"] }
 
 [features]
 std = ["rcore-fs/std"]

rcore-fs-sefs/src/lib.rs

@@ -13,7 +13,7 @@ use core::any::Any;
 use core::fmt::{Debug, Error, Formatter};
 use core::mem::MaybeUninit;
 
-use bitvec::BitVec;
+use bitvec::prelude::*;
 use rcore_fs::dev::TimeProvider;
 use rcore_fs::dirty::Dirty;
 use rcore_fs::vfs::{self, FileSystem, FsError, INode, Timespec};
@@ -452,7 +452,7 @@ pub struct SEFS {
     /// on-disk superblock
     super_block: RwLock<Dirty<SuperBlock>>,
     /// blocks in use are marked 0
-    free_map: RwLock<Dirty<BitVec>>,
+    free_map: RwLock<Dirty<BitVec<Lsb0, u8>>>,
     /// inode list
     inodes: RwLock<BTreeMap<INodeId, Weak<INodeImpl>>>,
     /// device
@@ -486,7 +486,7 @@ impl SEFS {
             let block_id = Self::get_freemap_block_id_of_group(i);
             meta_file.read_block(
                 block_id,
-                &mut free_map.as_mut()[BLKSIZE * i..BLKSIZE * (i + 1)],
+                &mut free_map.as_mut_slice()[BLKSIZE * i..BLKSIZE * (i + 1)],
             )?;
         }
 
@@ -673,7 +673,7 @@ impl vfs::FileSystem for SEFS {
         let mut free_map = self.free_map.write();
         if free_map.dirty() {
             for i in 0..super_block.groups as usize {
-                let slice = &free_map.as_ref()[BLKSIZE * i..BLKSIZE * (i + 1)];
+                let slice = &free_map.as_slice()[BLKSIZE * i..BLKSIZE * (i + 1)];
                 self.meta_file
                     .write_all_at(slice, BLKSIZE * Self::get_freemap_block_id_of_group(i))?;
             }
@@ -720,7 +720,7 @@ trait BitsetAlloc {
     fn alloc(&mut self) -> Option<usize>;
 }
 
-impl BitsetAlloc for BitVec {
+impl BitsetAlloc for BitVec<Lsb0, u8> {
     fn alloc(&mut self) -> Option<usize> {
         // TODO: more efficient
         let id = (0..self.len()).find(|&i| self[i]);
@@ -731,7 +731,7 @@ impl BitsetAlloc for BitVec {
     }
 }
 
-impl AsBuf for BitVec {
+impl AsBuf for BitVec<Lsb0, u8> {
     fn as_buf(&self) -> &[u8] {
         self.as_ref()
     }

rcore-fs-sfs/Cargo.toml

@@ -7,13 +7,9 @@ edition = "2018"
 [dependencies]
 rcore-fs = { path = "../rcore-fs" }
 static_assertions = "0.3"
-spin = "0.4"
+spin = "0.5"
 log = "0.4"
-
-[dependencies.bitvec]
-version = "0.9"
-default-features = false
-features = ["alloc"]
+bitvec = { version = "0.17", default-features = false, features = ["alloc"] }
 
 [dev-dependencies]
-tempfile = "3.0.7"
+tempfile = "3.0.7"

rcore-fs-sfs/src/lib.rs

@@ -15,7 +15,7 @@ use core::any::Any;
 use core::fmt::{Debug, Error, Formatter};
 use core::mem::MaybeUninit;
 
-use bitvec::BitVec;
+use bitvec::prelude::*;
 use spin::RwLock;
 
 use rcore_fs::dev::Device;
@@ -724,7 +724,7 @@ pub struct SimpleFileSystem {
     /// on-disk superblock
     super_block: RwLock<Dirty<SuperBlock>>,
     /// blocks in use are mared 0
-    free_map: RwLock<Dirty<BitVec>>,
+    free_map: RwLock<Dirty<BitVec<Lsb0, u8>>>,
     /// inode list
     inodes: RwLock<BTreeMap<INodeId, Weak<INodeImpl>>>,
     /// device
@@ -982,7 +982,7 @@ trait BitsetAlloc {
     fn alloc(&mut self) -> Option<usize>;
 }
 
-impl BitsetAlloc for BitVec {
+impl BitsetAlloc for BitVec<Lsb0, u8> {
     fn alloc(&mut self) -> Option<usize> {
         // TODO: more efficient
         let id = (0..self.len()).find(|&i| self[i]);
@@ -993,7 +993,7 @@ impl BitsetAlloc for BitVec {
     }
 }
 
-impl AsBuf for BitVec {
+impl AsBuf for BitVec<Lsb0, u8> {
     fn as_buf(&self) -> &[u8] {
         self.as_ref()
     }