diff --git a/core/json/mod.rs b/core/json/mod.rs index c4bf263e8..ae343c173 100644 --- a/core/json/mod.rs +++ b/core/json/mod.rs @@ -190,7 +190,7 @@ pub fn json_extract(value: &OwnedValue, paths: &[OwnedValue]) -> crate::Result( } } - Ok(Some(¤t_element)) + Ok(Some(current_element)) } pub fn json_error_position(json: &OwnedValue) -> crate::Result { diff --git a/core/parameters.rs b/core/parameters.rs index 9bfdf7f63..c9f6b651f 100644 --- a/core/parameters.rs +++ b/core/parameters.rs @@ -76,7 +76,7 @@ impl Parameters { log::trace!("anonymous parameter at {index}"); index } - name if name.starts_with(&['$', ':', '@', '#']) => { + name if name.starts_with(['$', ':', '@', '#']) => { match self .list .iter() diff --git a/core/storage/btree.rs b/core/storage/btree.rs index c718bc976..c8746702d 100644 --- a/core/storage/btree.rs +++ b/core/storage/btree.rs @@ -167,7 +167,7 @@ impl BTreeCursor { /// Check if the table is empty. /// This is done by checking if the root page has no cells. - fn is_empty_table(&mut self) -> Result> { + fn is_empty_table(&self) -> Result> { let page = self.pager.read_page(self.root_page)?; return_if_locked!(page); @@ -473,7 +473,7 @@ impl BTreeCursor { &record.values[..record.values.len() - 1] >= &index_key.values } SeekOp::EQ => { - &record.values[..record.values.len() - 1] == &index_key.values + record.values[..record.values.len() - 1] == index_key.values } }; self.stack.advance(); diff --git a/core/translate/emitter.rs b/core/translate/emitter.rs index aa1aaecf9..13daa85ed 100644 --- a/core/translate/emitter.rs +++ b/core/translate/emitter.rs @@ -290,9 +290,9 @@ fn emit_program_for_delete( Ok(()) } -fn emit_delete_insns<'a>( +fn emit_delete_insns( program: &mut ProgramBuilder, - t_ctx: &mut TranslateCtx<'a>, + t_ctx: &mut TranslateCtx, source: &SourceOperator, limit: &Option, ) -> Result<()> { diff --git a/core/translate/planner.rs b/core/translate/planner.rs index 273b5eaec..c4182f259 100644 --- a/core/translate/planner.rs +++ b/core/translate/planner.rs @@ -12,7 +12,7 @@ use crate::{ }; use sqlite3_parser::ast::{self, Expr, FromClause, JoinType, Limit}; -pub const ROWID: &'static str = "rowid"; +pub const ROWID: &str = "rowid"; pub struct OperatorIdCounter { id: usize, diff --git a/core/translate/subquery.rs b/core/translate/subquery.rs index 206da45ba..fd0e6667b 100644 --- a/core/translate/subquery.rs +++ b/core/translate/subquery.rs @@ -12,9 +12,9 @@ use super::{ /// Emit the subqueries contained in the FROM clause. /// This is done first so the results can be read in the main query loop. -pub fn emit_subqueries<'a>( +pub fn emit_subqueries( program: &mut ProgramBuilder, - t_ctx: &mut TranslateCtx<'a>, + t_ctx: &mut TranslateCtx, referenced_tables: &mut [TableReference], source: &mut SourceOperator, ) -> Result<()> { diff --git a/core/vdbe/datetime.rs b/core/vdbe/datetime.rs index d238160da..2f9cdc601 100644 --- a/core/vdbe/datetime.rs +++ b/core/vdbe/datetime.rs @@ -579,14 +579,14 @@ fn parse_modifier(modifier: &str) -> Result { if parts[0].len() == digits_in_date { let date = parse_modifier_date(parts[0])?; Ok(Modifier::DateOffset { - years: sign * date.year() as i32, + years: sign * date.year(), months: sign * date.month() as i32, days: sign * date.day() as i32, }) } else { // time values are either 12, 8 or 5 digits let time = parse_modifier_time(parts[0])?; - let time_delta = (sign * (time.num_seconds_from_midnight() as i32)) as i32; + let time_delta = sign * (time.num_seconds_from_midnight() as i32); Ok(Modifier::TimeOffset(TimeDelta::seconds(time_delta.into()))) } } @@ -596,7 +596,7 @@ fn parse_modifier(modifier: &str) -> Result { // Convert time to total seconds (with sign) let time_delta = sign * (time.num_seconds_from_midnight() as i32); Ok(Modifier::DateTimeOffset { - years: sign * (date.year() as i32), + years: sign * (date.year()), months: sign * (date.month() as i32), days: sign * date.day() as i32, seconds: time_delta, diff --git a/core/vdbe/mod.rs b/core/vdbe/mod.rs index 3b97f9436..3b88e75ec 100644 --- a/core/vdbe/mod.rs +++ b/core/vdbe/mod.rs @@ -2311,7 +2311,7 @@ fn trace_insn(program: &Program, addr: InsnReference, insn: &Insn) { addr, insn, String::new(), - program.comments.get(&(addr as u32)).copied() + program.comments.get(&{ addr }).copied() ) ); } @@ -2322,7 +2322,7 @@ fn print_insn(program: &Program, addr: InsnReference, insn: &Insn, indent: Strin addr, insn, indent, - program.comments.get(&(addr as u32)).copied(), + program.comments.get(&{ addr }).copied(), ); println!("{}", s); }