Manually implement Deref instead of using derive.

kernel-rs/Cargo.toml

@@ -13,7 +13,7 @@ default = []
 test = []
 gicv2 = []
 gicv3 = []
-lfs = ["dep:derive_deref"]
+lfs = []
 
 [profile.dev]
 panic = "abort"
@@ -31,7 +31,6 @@ bitmaps = { version = "3.2.0", default-features = false }
 cfg-if = "1.0.0"
 const-zero = { git = "https://github.com/maxbla/const-zero.git" }
 cstr_core = { version = "0.2.6", default-features = false }
-derive_deref = { version = "1.1.1", optional = true }
 itertools = { version = "0.10.3", default-features = false }
 num-iter = { version = "0.1.43", default-features = false }
 pin-project = "1.0.11"

kernel-rs/src/fs/lfs/lfs.rs

@@ -2,8 +2,8 @@
 #![allow(clippy::module_inception)]
 
 use core::mem;
+use core::ops::Deref;
 
-use derive_deref::Deref;
 use pin_project::pin_project;
 use spin::Once;
 use static_assertions::const_assert;
@@ -55,7 +55,6 @@ impl<'s> From<&'s BufData> for &'s Checkpoint {
 
 /// A read-only guard of a `SegManager`.
 /// Must be `free`d when done using it.
-#[derive(Deref)]
 pub struct SegManagerReadOnlyGuard<'s>(SleepLockGuard<'s, SegManager>);
 
 impl SegManagerReadOnlyGuard<'_> {
@@ -64,9 +63,16 @@ impl SegManagerReadOnlyGuard<'_> {
     }
 }
 
+impl Deref for SegManagerReadOnlyGuard<'_> {
+    type Target = SegManager;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
 /// A read-only guard of a `SegManager`.
 /// Must be `free`d when done using it.
-#[derive(Deref)]
 pub struct ImapReadOnlyGuard<'s>(SleepLockGuard<'s, Imap>);
 
 impl ImapReadOnlyGuard<'_> {
@@ -75,6 +81,14 @@ impl ImapReadOnlyGuard<'_> {
     }
 }
 
+impl Deref for ImapReadOnlyGuard<'_> {
+    type Target = Imap;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
 impl Tx<'_, Lfs> {
     /// Acquires the lock on the `SegManager` and returns the lock guard.
     /// Use this to write blocks to the segment.