Signed-off-by: Thomas Mühlbacher <[email protected]>
---
bch_bindgen/src/bkey.rs | 2 +-
bch_bindgen/src/btree.rs | 24 ++++++++++++------------
bch_bindgen/src/lib.rs | 15 ++++-----------
src/commands/mount.rs | 19 ++++++++++++++-----
4 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/bch_bindgen/src/bkey.rs b/bch_bindgen/src/bkey.rs
index 2a012508..77e05900 100644
--- a/bch_bindgen/src/bkey.rs
+++ b/bch_bindgen/src/bkey.rs
@@ -129,7 +129,7 @@ pub struct BkeySCToText<'a, 'b> {
fs: &'b Fs,
}
-impl<'a, 'b> fmt::Display for BkeySCToText<'a, 'b> {
+impl fmt::Display for BkeySCToText<'_, '_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
unsafe {
printbuf_to_formatter(f, |buf| {
diff --git a/bch_bindgen/src/btree.rs b/bch_bindgen/src/btree.rs
index 1aaf3018..ed563b95 100644
--- a/bch_bindgen/src/btree.rs
+++ b/bch_bindgen/src/btree.rs
@@ -25,7 +25,7 @@ impl<'f> BtreeTrans<'f> {
}
}
-impl<'f> Drop for BtreeTrans<'f> {
+impl Drop for BtreeTrans<'_> {
fn drop(&mut self) {
unsafe { c::bch2_trans_put(&mut *self.raw) }
}
@@ -81,7 +81,7 @@ impl<'t> BtreeIter<'t> {
}
}
- pub fn peek_max<'i>(&'i mut self, end: c::bpos) ->
Result<Option<BkeySC<'i>>, bch_errcode> {
+ pub fn peek_max(&mut self, end: c::bpos) -> Result<Option<BkeySC<'_>>,
bch_errcode> {
unsafe {
let k = c::bch2_btree_iter_peek_max(&mut self.raw, end);
errptr_to_result_c(k.k).map(|_| {
@@ -127,7 +127,7 @@ impl<'t> BtreeIter<'t> {
}
}
-impl<'t> Drop for BtreeIter<'t> {
+impl Drop for BtreeIter<'_> {
fn drop(&mut self) {
unsafe { c::bch2_trans_iter_exit(self.raw.trans, &mut self.raw) }
}
@@ -166,27 +166,27 @@ impl<'t> BtreeNodeIter<'t> {
}
}
- pub fn peek<'i>(&'i mut self) -> Result<Option<&'i c::btree>, bch_errcode>
{
+ pub fn peek(&mut self) -> Result<Option<&c::btree>, bch_errcode> {
unsafe {
let b = c::bch2_btree_iter_peek_node(&mut self.raw);
errptr_to_result_c(b).map(|b| if !b.is_null() { Some(&*b) } else {
None })
}
}
- pub fn peek_and_restart<'i>(&'i mut self) -> Result<Option<&'i c::btree>,
bch_errcode> {
+ pub fn peek_and_restart(&mut self) -> Result<Option<&c::btree>,
bch_errcode> {
unsafe {
let b = c::bch2_btree_iter_peek_node_and_restart(&mut self.raw);
errptr_to_result_c(b).map(|b| if !b.is_null() { Some(&*b) } else {
None })
}
}
- pub fn advance<'i>(&'i mut self) {
+ pub fn advance(&mut self) {
unsafe {
c::bch2_btree_iter_next_node(&mut self.raw);
}
}
- pub fn next<'i>(&'i mut self) -> Result<Option<&'i c::btree>, bch_errcode>
{
+ pub fn next(&mut self) -> Result<Option<&c::btree>, bch_errcode> {
unsafe {
let b = c::bch2_btree_iter_next_node(&mut self.raw);
errptr_to_result_c(b).map(|b| if !b.is_null() { Some(&*b) } else {
None })
@@ -194,7 +194,7 @@ impl<'t> BtreeNodeIter<'t> {
}
}
-impl<'t> Drop for BtreeNodeIter<'t> {
+impl Drop for BtreeNodeIter<'_> {
fn drop(&mut self) {
unsafe { c::bch2_trans_iter_exit(self.raw.trans, &mut self.raw) }
}
@@ -202,11 +202,11 @@ impl<'t> Drop for BtreeNodeIter<'t> {
impl<'b, 'f> c::btree {
pub fn to_text(&'b self, fs: &'f Fs) -> BtreeNodeToText<'b, 'f> {
- BtreeNodeToText { b: &self, fs }
+ BtreeNodeToText { b: self, fs }
}
pub fn ondisk_to_text(&'b self, fs: &'f Fs) -> BtreeNodeOndiskToText<'b,
'f> {
- BtreeNodeOndiskToText { b: &self, fs }
+ BtreeNodeOndiskToText { b: self, fs }
}
}
@@ -215,7 +215,7 @@ pub struct BtreeNodeToText<'b, 'f> {
fs: &'f Fs,
}
-impl<'b, 'f> fmt::Display for BtreeNodeToText<'b, 'f> {
+impl fmt::Display for BtreeNodeToText<'_, '_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
printbuf_to_formatter(f, |buf| unsafe {
c::bch2_btree_node_to_text(buf, self.fs.raw, self.b)
@@ -228,7 +228,7 @@ pub struct BtreeNodeOndiskToText<'b, 'f> {
fs: &'f Fs,
}
-impl<'b, 'f> fmt::Display for BtreeNodeOndiskToText<'b, 'f> {
+impl fmt::Display for BtreeNodeOndiskToText<'_, '_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
printbuf_to_formatter(f, |buf| unsafe {
c::bch2_btree_node_ondisk_to_text(buf, self.fs.raw, self.b)
diff --git a/bch_bindgen/src/lib.rs b/bch_bindgen/src/lib.rs
index b68f2d9b..7825cde1 100644
--- a/bch_bindgen/src/lib.rs
+++ b/bch_bindgen/src/lib.rs
@@ -109,13 +109,8 @@ impl FromStr for c::btree_id {
let s = CString::new(s).unwrap();
let p = s.as_ptr();
- let v = unsafe {
- c::match_string(
- c::__bch2_btree_ids[..].as_ptr(),
- (-(1 as isize)) as usize,
- p,
- )
- };
+ let v =
+ unsafe { c::match_string(c::__bch2_btree_ids[..].as_ptr(),
(-1_isize) as usize, p) };
if v >= 0 {
Ok(unsafe { std::mem::transmute(v) })
} else {
@@ -131,9 +126,7 @@ impl FromStr for c::bch_bkey_type {
let s = CString::new(s).unwrap();
let p = s.as_ptr();
- let v = unsafe {
- c::match_string(c::bch2_bkey_types[..].as_ptr(), (-(1 as isize))
as usize, p)
- };
+ let v = unsafe { c::match_string(c::bch2_bkey_types[..].as_ptr(),
(-1_isize) as usize, p) };
if v >= 0 {
Ok(unsafe { std::mem::transmute(v) })
} else {
@@ -192,7 +185,7 @@ impl FromStr for c::bpos {
let ino: u64 = ino_str.parse().map_err(|_| BchToolsErr::InvalidBpos)?;
let off: u64 = off_str.parse().map_err(|_| BchToolsErr::InvalidBpos)?;
- let snp: u32 = snp_str.map(|s| s.parse().ok()).flatten().unwrap_or(0);
+ let snp: u32 = snp_str.and_then(|s| s.parse().ok()).unwrap_or(0);
Ok(c::bpos {
inode: ino,
diff --git a/src/commands/mount.rs b/src/commands/mount.rs
index 1b8f444a..148d686e 100644
--- a/src/commands/mount.rs
+++ b/src/commands/mount.rs
@@ -35,7 +35,9 @@ fn mount_inner(
// convert to pointers for ffi
let c_src = c_src.as_ptr();
let c_target = c_target.as_ptr();
- let data_ptr = data.as_ref().map_or(ptr::null(), |data|
data.as_ptr().cast());
+ let data_ptr = data
+ .as_ref()
+ .map_or(ptr::null(), |data| data.as_ptr().cast());
let fstype = fstype.as_ptr();
let mut ret;
@@ -66,7 +68,11 @@ fn mount_inner(
let e = crate::ErrnoError(err);
if err.0 == libc::EBUSY {
- eprintln!("mount: {}: {} already mounted or mount point busy",
target.to_string_lossy(), src);
+ eprintln!(
+ "mount: {}: {} already mounted or mount point busy",
+ target.to_string_lossy(),
+ src
+ );
} else {
eprintln!("mount: {}: {}", src, e);
}
@@ -248,7 +254,10 @@ fn devs_str_sbs_from_device(
let dev_sb = read_super_silent(device, *opts)?;
if dev_sb.sb().number_of_devices() == 1 {
- Ok((device.as_os_str().to_str().unwrap().to_string(), vec![dev_sb]))
+ Ok((
+ device.as_os_str().to_str().unwrap().to_string(),
+ vec![dev_sb],
+ ))
} else {
let uuid = dev_sb.sb().uuid();
@@ -390,8 +399,8 @@ pub fn mount(mut argv: Vec<String>, symlink_cmd:
Option<&str>) -> std::process::
logging::setup(cli.verbose, cli.colorize);
match cmd_mount_inner(&cli) {
- Ok(_) => std::process::ExitCode::SUCCESS,
- Err(e) => {
+ Ok(_) => std::process::ExitCode::SUCCESS,
+ Err(e) => {
error!("Mount failed: {e}");
std::process::ExitCode::FAILURE
}
--
2.48.1
