mirror of
https://github.com/koverstreet/bcachefs-tools.git
synced 2025-02-23 00:00:02 +03:00
Fix some warnings about elided lifetimes
these popped up on the latest rustc Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
parent
b1e6d1ced2
commit
282331defa
@ -64,7 +64,7 @@ impl<'a, 'b> BkeySC<'a> {
|
|||||||
BkeySCToText { k: self, fs }
|
BkeySCToText { k: self, fs }
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn v(&'a self) -> BkeyValC {
|
pub fn v(&'a self) -> BkeyValC<'a> {
|
||||||
unsafe {
|
unsafe {
|
||||||
let ty: c::bch_bkey_type = transmute(self.k.type_ as u32);
|
let ty: c::bch_bkey_type = transmute(self.k.type_ as u32);
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ pub struct BtreeTrans<'f> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl<'f> BtreeTrans<'f> {
|
impl<'f> BtreeTrans<'f> {
|
||||||
pub fn new(fs: &'f Fs) -> BtreeTrans {
|
pub fn new(fs: &'f Fs) -> BtreeTrans<'f> {
|
||||||
unsafe {
|
unsafe {
|
||||||
BtreeTrans {
|
BtreeTrans {
|
||||||
raw: &mut *c::__bch2_trans_get(fs.raw, 0),
|
raw: &mut *c::__bch2_trans_get(fs.raw, 0),
|
||||||
@ -81,7 +81,7 @@ impl<'t> BtreeIter<'t> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn peek_upto<'i>(&'i mut self, end: c::bpos) -> Result<Option<BkeySC>, bch_errcode> {
|
pub fn peek_upto<'i>(&'i mut self, end: c::bpos) -> Result<Option<BkeySC<'i>>, bch_errcode> {
|
||||||
unsafe {
|
unsafe {
|
||||||
let k = c::bch2_btree_iter_peek_upto(&mut self.raw, end);
|
let k = c::bch2_btree_iter_peek_upto(&mut self.raw, end);
|
||||||
errptr_to_result_c(k.k).map(|_| {
|
errptr_to_result_c(k.k).map(|_| {
|
||||||
@ -146,7 +146,7 @@ impl<'t> BtreeNodeIter<'t> {
|
|||||||
locks_want: u32,
|
locks_want: u32,
|
||||||
depth: u32,
|
depth: u32,
|
||||||
flags: BtreeIterFlags,
|
flags: BtreeIterFlags,
|
||||||
) -> BtreeNodeIter {
|
) -> BtreeNodeIter<'t> {
|
||||||
unsafe {
|
unsafe {
|
||||||
let mut iter: MaybeUninit<c::btree_iter> = MaybeUninit::uninit();
|
let mut iter: MaybeUninit<c::btree_iter> = MaybeUninit::uninit();
|
||||||
c::bch2_trans_node_iter_init(
|
c::bch2_trans_node_iter_init(
|
||||||
|
Loading…
Reference in New Issue
Block a user