From f6cbd9cd6c6ecc11bf96fe76471e4f67de023700 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 10 Sep 2023 12:38:50 +0300 Subject: [PATCH] Eliminate unused variables --- core/pager.rs | 2 +- core/translate.rs | 43 +++++++++---------------------------------- 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/core/pager.rs b/core/pager.rs index f21b955a0..0a5cf62be 100644 --- a/core/pager.rs +++ b/core/pager.rs @@ -27,7 +27,7 @@ impl Pager { } pub fn read_page(&self, page_idx: usize) -> anyhow::Result> { - let handle = self.page_cache.get_or_try_init(page_idx, 1, |idx| { + let handle = self.page_cache.get_or_try_init(page_idx, 1, |_idx| { let mut buffer_pool = self.buffer_pool.lock().unwrap(); let page = sqlite3_ondisk::read_btree_page(&self.database, &mut buffer_pool, page_idx) .unwrap(); diff --git a/core/translate.rs b/core/translate.rs index 902a8715b..223761b40 100644 --- a/core/translate.rs +++ b/core/translate.rs @@ -113,46 +113,21 @@ fn translate_columns( for col in columns { match col { sqlite3_parser::ast::ResultColumn::Expr(expr, _) => match expr { - sqlite3_parser::ast::Expr::Between { - lhs, - not, - start, - end, - } => todo!(), + sqlite3_parser::ast::Expr::Between { .. } => todo!(), sqlite3_parser::ast::Expr::Binary(_, _, _) => todo!(), - sqlite3_parser::ast::Expr::Case { - base, - when_then_pairs, - else_expr, - } => todo!(), - sqlite3_parser::ast::Expr::Cast { expr, type_name } => todo!(), + sqlite3_parser::ast::Expr::Case { .. } => todo!(), + sqlite3_parser::ast::Expr::Cast { .. } => todo!(), sqlite3_parser::ast::Expr::Collate(_, _) => todo!(), sqlite3_parser::ast::Expr::DoublyQualified(_, _, _) => todo!(), sqlite3_parser::ast::Expr::Exists(_) => todo!(), - sqlite3_parser::ast::Expr::FunctionCall { - name, - distinctness, - args, - filter_over, - } => todo!(), - sqlite3_parser::ast::Expr::FunctionCallStar { name, filter_over } => todo!(), + sqlite3_parser::ast::Expr::FunctionCall { .. } => todo!(), + sqlite3_parser::ast::Expr::FunctionCallStar { .. } => todo!(), sqlite3_parser::ast::Expr::Id(_) => todo!(), - sqlite3_parser::ast::Expr::InList { lhs, not, rhs } => todo!(), - sqlite3_parser::ast::Expr::InSelect { lhs, not, rhs } => todo!(), - sqlite3_parser::ast::Expr::InTable { - lhs, - not, - rhs, - args, - } => todo!(), + sqlite3_parser::ast::Expr::InList { .. } => todo!(), + sqlite3_parser::ast::Expr::InSelect { .. } => todo!(), + sqlite3_parser::ast::Expr::InTable { .. } => todo!(), sqlite3_parser::ast::Expr::IsNull(_) => todo!(), - sqlite3_parser::ast::Expr::Like { - lhs, - not, - op, - rhs, - escape, - } => todo!(), + sqlite3_parser::ast::Expr::Like { .. } => todo!(), sqlite3_parser::ast::Expr::Literal(lit) => match lit { sqlite3_parser::ast::Literal::Numeric(val) => { let dest = program.alloc_register();