Skip to content

Commit 7e2e105

Browse files
authored
Merge pull request #251 from nolanderc/fn-once-reserve
replace all `FnMut` with `FnOnce` in `put_reserve_*`
2 parents 1d35f42 + 8aa5de3 commit 7e2e105

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

heed/src/cursor.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,10 @@ impl<'txn> RwCursor<'txn> {
334334
flags: PutFlags,
335335
key: &[u8],
336336
data_size: usize,
337-
mut write_func: F,
337+
write_func: F,
338338
) -> Result<bool>
339339
where
340-
F: FnMut(&mut ReservedSpace) -> io::Result<()>,
340+
F: FnOnce(&mut ReservedSpace) -> io::Result<()>,
341341
{
342342
let mut key_val = crate::into_val(key);
343343
let mut reserved = ffi::reserve_size_val(data_size);
@@ -353,7 +353,7 @@ impl<'txn> RwCursor<'txn> {
353353
};
354354

355355
let mut reserved = ReservedSpace::from_val(reserved);
356-
(write_func)(&mut reserved)?;
356+
write_func(&mut reserved)?;
357357

358358
if reserved.remaining() == 0 {
359359
Ok(found)

heed/src/database.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1882,11 +1882,11 @@ impl<KC, DC, C> Database<KC, DC, C> {
18821882
txn: &mut RwTxn,
18831883
key: &'a KC::EItem,
18841884
data_size: usize,
1885-
mut write_func: F,
1885+
write_func: F,
18861886
) -> Result<()>
18871887
where
18881888
KC: BytesEncode<'a>,
1889-
F: FnMut(&mut ReservedSpace) -> io::Result<()>,
1889+
F: FnOnce(&mut ReservedSpace) -> io::Result<()>,
18901890
{
18911891
assert_eq_env_db_txn!(self, txn);
18921892

@@ -1900,7 +1900,7 @@ impl<KC, DC, C> Database<KC, DC, C> {
19001900
}
19011901

19021902
let mut reserved = unsafe { ReservedSpace::from_val(reserved) };
1903-
(write_func)(&mut reserved)?;
1903+
write_func(&mut reserved)?;
19041904
if reserved.remaining() == 0 {
19051905
Ok(())
19061906
} else {

heed/src/iterator/iter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ impl<'txn, KC, DC, IM> RwIter<'txn, KC, DC, IM> {
299299
) -> Result<bool>
300300
where
301301
KC: BytesEncode<'a>,
302-
F: FnMut(&mut ReservedSpace) -> io::Result<()>,
302+
F: FnOnce(&mut ReservedSpace) -> io::Result<()>,
303303
{
304304
let key_bytes: Cow<[u8]> = KC::bytes_encode(key).map_err(Error::Encoding)?;
305305
self.cursor.put_current_reserved_with_flags(flags, &key_bytes, data_size, write_func)
@@ -648,7 +648,7 @@ impl<'txn, KC, DC, IM> RwRevIter<'txn, KC, DC, IM> {
648648
) -> Result<bool>
649649
where
650650
KC: BytesEncode<'a>,
651-
F: FnMut(&mut ReservedSpace) -> io::Result<()>,
651+
F: FnOnce(&mut ReservedSpace) -> io::Result<()>,
652652
{
653653
let key_bytes: Cow<[u8]> = KC::bytes_encode(key).map_err(Error::Encoding)?;
654654
self.cursor.put_current_reserved_with_flags(flags, &key_bytes, data_size, write_func)

heed/src/iterator/prefix.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ impl<'txn, KC, DC, C, IM> RwPrefix<'txn, KC, DC, C, IM> {
292292
) -> Result<bool>
293293
where
294294
KC: BytesEncode<'a>,
295-
F: FnMut(&mut ReservedSpace) -> io::Result<()>,
295+
F: FnOnce(&mut ReservedSpace) -> io::Result<()>,
296296
{
297297
let key_bytes: Cow<[u8]> = KC::bytes_encode(key).map_err(Error::Encoding)?;
298298
self.cursor.put_current_reserved_with_flags(flags, &key_bytes, data_size, write_func)
@@ -682,7 +682,7 @@ impl<'txn, KC, DC, C, IM> RwRevPrefix<'txn, KC, DC, C, IM> {
682682
) -> Result<bool>
683683
where
684684
KC: BytesEncode<'a>,
685-
F: FnMut(&mut ReservedSpace) -> io::Result<()>,
685+
F: FnOnce(&mut ReservedSpace) -> io::Result<()>,
686686
{
687687
let key_bytes: Cow<[u8]> = KC::bytes_encode(key).map_err(Error::Encoding)?;
688688
self.cursor.put_current_reserved_with_flags(flags, &key_bytes, data_size, write_func)

heed/src/iterator/range.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ impl<'txn, KC, DC, IM> RwRange<'txn, KC, DC, IM> {
301301
) -> Result<bool>
302302
where
303303
KC: BytesEncode<'a>,
304-
F: FnMut(&mut ReservedSpace) -> io::Result<()>,
304+
F: FnOnce(&mut ReservedSpace) -> io::Result<()>,
305305
{
306306
let key_bytes: Cow<[u8]> = KC::bytes_encode(key).map_err(Error::Encoding)?;
307307
self.cursor.put_current_reserved_with_flags(flags, &key_bytes, data_size, write_func)
@@ -738,7 +738,7 @@ impl<'txn, KC, DC, IM> RwRevRange<'txn, KC, DC, IM> {
738738
) -> Result<bool>
739739
where
740740
KC: BytesEncode<'a>,
741-
F: FnMut(&mut ReservedSpace) -> io::Result<()>,
741+
F: FnOnce(&mut ReservedSpace) -> io::Result<()>,
742742
{
743743
let key_bytes: Cow<[u8]> = KC::bytes_encode(key).map_err(Error::Encoding)?;
744744
self.cursor.put_current_reserved_with_flags(flags, &key_bytes, data_size, write_func)

0 commit comments

Comments
 (0)