more clippy

core/mvcc/cursor.rs

@@ -60,7 +60,6 @@ impl<Clock: LogicalClock + 'static> MvccLazyCursor<Clock> {
         db: Arc<MvStore<Clock>>,
         tx_id: u64,
         root_page_or_table_id: i64,
-        pager: Arc<Pager>,
         btree_cursor: Box<dyn CursorTrait>,
     ) -> Result<MvccLazyCursor<Clock>> {
         assert!(
@@ -311,7 +310,7 @@ impl<Clock: LogicalClock + 'static> CursorTrait for MvccLazyCursor<Clock> {
             // In End we can assume we have already called next and it returned false, so we can assume we have consumed the rowid.
             let btree_consumed = match self.get_current_pos() {
                 CursorPosition::Loaded {
-                    row_id,
+                    row_id: _,
                     in_btree: _,
                     btree_consumed,
                 } => btree_consumed,

core/mvcc/database/tests.rs

@@ -829,7 +829,6 @@ fn test_lazy_scan_cursor_basic() {
         db.mvcc_store.clone(),
         tx_id,
         table_id,
-        db.conn.pager.load().clone(),
         Box::new(BTreeCursor::new(db.conn.pager.load().clone(), table_id, 1)),
     )
     .unwrap();
@@ -872,7 +871,6 @@ fn test_lazy_scan_cursor_with_gaps() {
         db.mvcc_store.clone(),
         tx_id,
         table_id,
-        db.conn.pager.load().clone(),
         Box::new(BTreeCursor::new(db.conn.pager.load().clone(), table_id, 1)),
     )
     .unwrap();
@@ -924,7 +922,6 @@ fn test_cursor_basic() {
         db.mvcc_store.clone(),
         tx_id,
         table_id,
-        db.conn.pager.load().clone(),
         Box::new(BTreeCursor::new(db.conn.pager.load().clone(), table_id, 1)),
     )
     .unwrap();
@@ -979,7 +976,6 @@ fn test_cursor_with_empty_table() {
         db.mvcc_store.clone(),
         tx_id,
         table_id,
-        db.conn.pager.load().clone(),
         Box::new(BTreeCursor::new(db.conn.pager.load().clone(), table_id, 1)),
     )
     .unwrap();
@@ -997,7 +993,6 @@ fn test_cursor_modification_during_scan() {
         db.mvcc_store.clone(),
         tx_id,
         table_id,
-        db.conn.pager.load().clone(),
         Box::new(BTreeCursor::new(db.conn.pager.load().clone(), table_id, 1)),
     )
     .unwrap();

core/vdbe/execute.rs

@@ -945,7 +945,6 @@ pub fn op_open_read(
                     mv_store,
                     tx_id,
                     *root_page,
-                    pager.clone(),
                     btree_cursor,
                 )?))
             } else {
@@ -7117,7 +7116,6 @@ pub fn op_open_write(
                         mv_store,
                         tx_id,
                         root_page,
-                        pager.clone(),
                         btree_cursor,
                     )?))
                 } else {
@@ -8112,13 +8110,7 @@ pub fn op_open_dup(
             let cursor: Box<dyn CursorTrait> =
                 if let Some(tx_id) = program.connection.get_mv_tx_id() {
                     let mv_store = mv_store.unwrap().clone();
-                    Box::new(MvCursor::new(
-                        mv_store,
-                        tx_id,
-                        root_page,
-                        pager.clone(),
-                        cursor,
-                    )?)
+                    Box::new(MvCursor::new(mv_store, tx_id, root_page, cursor)?)
                 } else {
                     cursor
                 };