From d9658070a935788df21f8bd4eb99e8d207abc6e4 Mon Sep 17 00:00:00 2001 From: PThorpe92 Date: Fri, 26 Sep 2025 12:17:34 -0400 Subject: [PATCH] Fix clippy warnings --- core/translate/analyze.rs | 2 +- core/translate/attach.rs | 8 ++++---- core/translate/index.rs | 6 +++--- core/translate/insert.rs | 13 ++++++------- core/translate/upsert.rs | 4 ++-- core/translate/view.rs | 2 +- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/core/translate/analyze.rs b/core/translate/analyze.rs index 8848f6c5f..f91b6b4d8 100644 --- a/core/translate/analyze.rs +++ b/core/translate/analyze.rs @@ -142,7 +142,7 @@ pub fn translate_analyze( // Add the table entry to sqlite_schema emit_schema_entry( &mut program, - &resolver, + resolver, sqlite_schema_cursor_id, None, SchemaEntryType::Table, diff --git a/core/translate/attach.rs b/core/translate/attach.rs index 0ec29e101..5cf7729b2 100644 --- a/core/translate/attach.rs +++ b/core/translate/attach.rs @@ -54,7 +54,7 @@ pub fn translate_attach( }); } _ => { - translate_expr(&mut program, None, expr, arg_reg, &resolver)?; + translate_expr(&mut program, None, expr, arg_reg, resolver)?; } } @@ -85,13 +85,13 @@ pub fn translate_attach( }); } _ => { - translate_expr(&mut program, None, db_name, arg_reg + 1, &resolver)?; + translate_expr(&mut program, None, db_name, arg_reg + 1, resolver)?; } } // Load key argument (NULL if not provided) if let Some(key_expr) = key { - translate_expr(&mut program, None, key_expr, arg_reg + 2, &resolver)?; + translate_expr(&mut program, None, key_expr, arg_reg + 2, resolver)?; } else { program.emit_insn(Insn::Null { dest: arg_reg + 2, @@ -157,7 +157,7 @@ pub fn translate_detach( }); } _ => { - translate_expr(&mut program, None, expr, arg_reg, &resolver)?; + translate_expr(&mut program, None, expr, arg_reg, resolver)?; } } diff --git a/core/translate/index.rs b/core/translate/index.rs index 75d657446..44930fb08 100644 --- a/core/translate/index.rs +++ b/core/translate/index.rs @@ -181,7 +181,7 @@ pub fn translate_create_index( let cdc_table = prepare_cdc_if_necessary(&mut program, resolver.schema, SQLITE_TABLEID)?; emit_schema_entry( &mut program, - &resolver, + resolver, sqlite_schema_cursor_id, cdc_table.map(|x| x.0), SchemaEntryType::Index, @@ -239,7 +239,7 @@ pub fn translate_create_index( jump_target_when_false: label, jump_target_when_true: BranchOffset::Placeholder, }, - &resolver, + resolver, )?; skip_row_label = Some(label); } @@ -553,7 +553,7 @@ pub fn translate_drop_index( }; emit_cdc_insns( &mut program, - &resolver, + resolver, OperationMode::DELETE, cdc_cursor_id, row_id_reg, diff --git a/core/translate/insert.rs b/core/translate/insert.rs index 374b8cd87..2567a3215 100644 --- a/core/translate/insert.rs +++ b/core/translate/insert.rs @@ -438,7 +438,7 @@ pub fn translate_insert( &mut program, &insertion, yield_reg_opt.unwrap() + 1, - &resolver, + resolver, &temp_table_ctx, )?; } else { @@ -449,7 +449,7 @@ pub fn translate_insert( db: 0, }); - translate_rows_single(&mut program, &values.unwrap(), &insertion, &resolver)?; + translate_rows_single(&mut program, &values.unwrap(), &insertion, resolver)?; } // Open all the index btrees for writing @@ -714,7 +714,7 @@ pub fn translate_insert( Some(&TableReferences::new_empty()), &where_for_eval, reg, - &resolver, + resolver, NoConstantOptReason::RegisterReuse, )?; let lbl = program.allocate_label(); @@ -953,7 +953,7 @@ pub fn translate_insert( Some(&TableReferences::new_empty()), &where_for_eval, reg, - &resolver, + resolver, NoConstantOptReason::RegisterReuse, )?; let lbl = program.allocate_label(); @@ -1060,7 +1060,7 @@ pub fn translate_insert( }; emit_cdc_insns( &mut program, - &resolver, + resolver, OperationMode::INSERT, *cdc_cursor_id, insertion.key_register(), @@ -1100,14 +1100,13 @@ pub fn translate_insert( emit_upsert( &mut program, - resolver.schema, &table, &insertion, cursor_id, conflict_rowid_reg, &mut rewritten_sets, where_clause, - &resolver, + resolver, &idx_cursors, &mut result_columns, cdc_table.as_ref().map(|c| c.0), diff --git a/core/translate/upsert.rs b/core/translate/upsert.rs index 9755802c8..38ef1d5d6 100644 --- a/core/translate/upsert.rs +++ b/core/translate/upsert.rs @@ -341,7 +341,6 @@ pub fn resolve_upsert_target( /// (unchanged) row. To refer to would-be inserted values, use `excluded.x`. pub fn emit_upsert( program: &mut ProgramBuilder, - schema: &Schema, table: &Table, insertion: &Insertion, tbl_cursor_id: usize, @@ -476,7 +475,8 @@ pub fn emit_upsert( let (changed_cols, rowid_changed) = collect_changed_cols(table, set_pairs); for (idx_name, _root, idx_cid) in idx_cursors { - let idx_meta = schema + let idx_meta = resolver + .schema .get_index(table.get_name(), idx_name) .expect("index exists"); diff --git a/core/translate/view.rs b/core/translate/view.rs index 548ca5bc2..592d7731a 100644 --- a/core/translate/view.rs +++ b/core/translate/view.rs @@ -190,7 +190,7 @@ pub fn translate_create_materialized_view( ); emit_schema_entry( &mut program, - &resolver, + resolver, sqlite_schema_cursor_id, None, // cdc_table_cursor_id SchemaEntryType::Index,