Start using loopdev-erikh instead of loopdev

The loopdev maintainer seems unable to maintain, but also has not transferred ownership, so this fork may be the best current choice. Signed-off-by: mulhern <[email protected]>
stratis-storage · Nov 27, 2023 · c0a9985 · c0a9985
1 parent 3d482fb
commit c0a9985
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -227,7 +227,7 @@ optional = true
 [dev-dependencies]
 assert_cmd = "2.0.8"
 assert_matches = "1.5.0"
-loopdev = "0.4.0"
+loopdev-erikh = "0.5.0"
 predicates = "3.0.0"
 proptest = "1.0.0"
 
@@ -273,11 +273,6 @@ min = ["termios"]
 systemd_compat = ["bindgen"]
 udev_scripts = ["data-encoding"]
 
-# FIXME: remove when loopdev dependency lower bound is increased from 0.4.0
-[patch.crates-io.loopdev]
-git = "https://github.com/mulkieran/loopdev"
-branch = "bump-bindgen-reduce-version-0.68.1"
-
 [package.metadata.vendor-filter]
 platforms = ["*-unknown-linux-gnu"]
 tier = "2"

diff --git a/src/engine/strat_engine/tests/loopbacked.rs b/src/engine/strat_engine/tests/loopbacked.rs
@@ -11,7 +11,7 @@ use std::{
     sync::Once,
 };
 
-use loopdev::{LoopControl, LoopDevice};
+use loopdev_erikh::{LoopControl, LoopDevice};
 
 use devicemapper::{Bytes, Sectors, IEC};