Skip to content

Commit af923dc

Browse files
committed
explicitly identify reference in match patterns
1 parent 09d7656 commit af923dc

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/cursor.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,12 @@ impl <'txn> Iterator for Iter<'txn> {
262262

263263
fn next(&mut self) -> Option<Result<(&'txn [u8], &'txn [u8])>> {
264264
match self {
265-
Iter::Ok { cursor, ref mut op, next_op, _marker } => {
265+
&mut Iter::Ok { cursor, ref mut op, next_op, _marker } => {
266266
let mut key = ffi::MDB_val { mv_size: 0, mv_data: ptr::null_mut() };
267267
let mut data = ffi::MDB_val { mv_size: 0, mv_data: ptr::null_mut() };
268-
let op = mem::replace(op, *next_op);
268+
let op = mem::replace(op, next_op);
269269
unsafe {
270-
match ffi::mdb_cursor_get(*cursor, &mut key, &mut data, op) {
270+
match ffi::mdb_cursor_get(cursor, &mut key, &mut data, op) {
271271
ffi::MDB_SUCCESS => Some(Ok((val_to_slice(key), val_to_slice(data)))),
272272
// EINVAL can occur when the cursor was previously seeked to a non-existent value,
273273
// e.g. iter_from with a key greater than all values in the database.
@@ -276,7 +276,7 @@ impl <'txn> Iterator for Iter<'txn> {
276276
}
277277
}
278278
},
279-
Iter::Err(err) => Some(Err(*err)),
279+
&mut Iter::Err(err) => Some(Err(err)),
280280
}
281281
}
282282
}
@@ -329,21 +329,21 @@ impl <'txn> Iterator for IterDup<'txn> {
329329

330330
fn next(&mut self) -> Option<Iter<'txn>> {
331331
match self {
332-
IterDup::Ok { cursor, ref mut op, _marker } => {
332+
&mut IterDup::Ok { cursor, ref mut op, _marker } => {
333333
let mut key = ffi::MDB_val { mv_size: 0, mv_data: ptr::null_mut() };
334334
let mut data = ffi::MDB_val { mv_size: 0, mv_data: ptr::null_mut() };
335335
let op = mem::replace(op, ffi::MDB_NEXT_NODUP);
336336
let err_code = unsafe {
337-
ffi::mdb_cursor_get(*cursor, &mut key, &mut data, op)
337+
ffi::mdb_cursor_get(cursor, &mut key, &mut data, op)
338338
};
339339

340340
if err_code == ffi::MDB_SUCCESS {
341-
Some(Iter::new(*cursor, ffi::MDB_GET_CURRENT, ffi::MDB_NEXT_DUP))
341+
Some(Iter::new(cursor, ffi::MDB_GET_CURRENT, ffi::MDB_NEXT_DUP))
342342
} else {
343343
None
344344
}
345345
},
346-
IterDup::Err(err) => Some(Iter::Err(*err)),
346+
&mut IterDup::Err(err) => Some(Iter::Err(err)),
347347
}
348348
}
349349
}

0 commit comments

Comments
 (0)