You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
rust-btrd/btrd-bump-nix.patch

69 lines
1.9 KiB

diff -Naur a/Cargo.lock b/Cargo.lock
--- a/Cargo.lock 1969-12-31 16:00:01.000000000 -0800
+++ b/Cargo.lock 2021-10-26 13:31:36.126273907 -0700
@@ -36,9 +36,9 @@
[[package]]
name = "bitflags"
-version = "1.3.1"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da1976d75adbe5fbc88130ecd119529cf1cc6a93ae1546d8696ee66f0d21af1"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
[[package]]
name = "btrd"
@@ -48,7 +48,7 @@
"lazy_static",
"log",
"memmap2",
- "nix 0.21.0",
+ "nix 0.22.2",
"pom",
"rustyline",
"rustyline-derive",
@@ -251,9 +251,9 @@
[[package]]
name = "nix"
-version = "0.21.0"
+version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3728fec49d363a50a8828a190b379a446cc5cf085c06259bbbeb34447e4ec7"
+checksum = "d3bb9a13fa32bc5aeb64150cd3f32d6cf4c748f8f8a417cce5d2eb976a8370ba"
dependencies = [
"bitflags",
"cc",
diff -Naur a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml 1969-12-31 16:00:01.000000000 -0800
+++ b/Cargo.toml 2021-10-26 13:31:57.715388958 -0700
@@ -31,7 +31,7 @@
version = "0.3"
[dependencies.nix]
-version = "0.21"
+version = "0.22"
[dependencies.pom]
version = "3.2"
diff -Naur a/src/btrfs/fs.rs b/src/btrfs/fs.rs
--- a/src/btrfs/fs.rs 1973-11-29 13:33:09.000000000 -0800
+++ b/src/btrfs/fs.rs 2021-10-26 13:31:36.127273913 -0700
@@ -15,7 +15,6 @@
use nix::fcntl::OFlag;
use nix::ioctl_readwrite;
use nix::sys::{stat::Mode, statfs::fstatfs};
-use nix::Error as NixError;
const BTRFS_SUPERBLOCK_MAGIC: [u8; 8] = *b"_BHRfS_M";
const BTRFS_SUPERBLOCK_MAGIC_LOCS: [usize; 3] =
@@ -202,7 +201,7 @@
match unsafe { btrfs_tree_search_v2(fs.as_raw_fd(), &mut *args) } {
Ok(_) => (),
- Err(NixError::Sys(Errno::EOVERFLOW)) => (),
+ Err(Errno::EOVERFLOW) => (),
Err(e) => bail!(e),
};