From 28bd0275c0dffe37703633afddbd23b1641cbda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=A0=EC=9A=B0?= Date: Thu, 15 Aug 2024 18:56:02 +0900 Subject: [PATCH] Run cargo fmt, clippy --- Cargo.lock | 2 +- core/translate/expr.rs | 2 +- core/vdbe/mod.rs | 43 +++++++++++++++++++++++++++++++-------- sqlite3/include/sqlite3.h | 6 +++--- 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83188049b..fde486a82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "limbo_sqlite3" -version = "0.0.1" +version = "0.0.3" dependencies = [ "cbindgen", "env_logger 0.11.3", diff --git a/core/translate/expr.rs b/core/translate/expr.rs index dc9396396..882f64c3b 100644 --- a/core/translate/expr.rs +++ b/core/translate/expr.rs @@ -304,7 +304,7 @@ pub fn translate_expr( } ScalarFunc::Substring => { let args = if let Some(args) = args { - if !(args.len() == 2 || args.len() == 3) { + if !(args.len() == 2 || args.len() == 3) { crate::bail_parse_error!( "{} function with wrong number of arguments", srf.to_string() diff --git a/core/vdbe/mod.rs b/core/vdbe/mod.rs index c1580ff11..0bb64a0de 100644 --- a/core/vdbe/mod.rs +++ b/core/vdbe/mod.rs @@ -1649,8 +1649,14 @@ fn exec_minmax<'a>( regs.into_iter().reduce(|a, b| op(a, b)).cloned() } -fn exec_substring(str_value: &OwnedValue, start_value: &OwnedValue, length_value: &OwnedValue) -> OwnedValue { - if let (OwnedValue::Text(str), OwnedValue::Integer(start), OwnedValue::Integer(length)) = (str_value, start_value, length_value) { +fn exec_substring( + str_value: &OwnedValue, + start_value: &OwnedValue, + length_value: &OwnedValue, +) -> OwnedValue { + if let (OwnedValue::Text(str), OwnedValue::Integer(start), OwnedValue::Integer(length)) = + (str_value, start_value, length_value) + { let start = *start as usize; if start > str.len() { return OwnedValue::Text(Rc::new("".to_string())); @@ -1658,7 +1664,11 @@ fn exec_substring(str_value: &OwnedValue, start_value: &OwnedValue, length_value let start_idx = start - 1; let str_len = str.len(); - let end = if *length != -1 { start_idx + *length as usize } else { str_len }; + let end = if *length != -1 { + start_idx + *length as usize + } else { + str_len + }; let substring = &str[start_idx..end.min(str_len)]; OwnedValue::Text(Rc::new(substring.to_string())) @@ -1787,7 +1797,11 @@ fn exec_if(reg: &OwnedValue, null_reg: &OwnedValue, not: bool) -> bool { #[cfg(test)] mod tests { - use super::{exec_abs, exec_if, exec_length, exec_like, exec_lower, exec_ltrim, exec_minmax, exec_random, exec_round, exec_rtrim, exec_substring, exec_trim, exec_unicode, exec_upper, get_new_rowid, Cursor, CursorResult, LimboError, OwnedRecord, OwnedValue, Result}; + use super::{ + exec_abs, exec_if, exec_length, exec_like, exec_lower, exec_ltrim, exec_minmax, + exec_random, exec_round, exec_rtrim, exec_substring, exec_trim, exec_unicode, exec_upper, + get_new_rowid, Cursor, CursorResult, LimboError, OwnedRecord, OwnedValue, Result, + }; use mockall::{mock, predicate, predicate::*}; use rand::{rngs::mock::StepRng, thread_rng}; use std::{cell::Ref, rc::Rc}; @@ -2188,30 +2202,41 @@ mod tests { let start_value = OwnedValue::Integer(1); let length_value = OwnedValue::Integer(3); let expected_val = OwnedValue::Text(Rc::new(String::from("lim"))); - assert_eq!(exec_substring(&str_value, &start_value, &length_value), expected_val); + assert_eq!( + exec_substring(&str_value, &start_value, &length_value), + expected_val + ); let str_value = OwnedValue::Text(Rc::new("limbo".to_string())); let start_value = OwnedValue::Integer(1); let length_value = OwnedValue::Integer(10); let expected_val = OwnedValue::Text(Rc::new(String::from("limbo"))); - assert_eq!(exec_substring(&str_value, &start_value, &length_value), expected_val); + assert_eq!( + exec_substring(&str_value, &start_value, &length_value), + expected_val + ); let str_value = OwnedValue::Text(Rc::new("limbo".to_string())); let start_value = OwnedValue::Integer(10); let length_value = OwnedValue::Integer(3); let expected_val = OwnedValue::Text(Rc::new(String::from(""))); - assert_eq!(exec_substring(&str_value, &start_value, &length_value), expected_val); + assert_eq!( + exec_substring(&str_value, &start_value, &length_value), + expected_val + ); let str_value = OwnedValue::Text(Rc::new("limbo".to_string())); let start_value = OwnedValue::Integer(3); let length_value = OwnedValue::Null; let expected_val = OwnedValue::Text(Rc::new(String::from("mbo"))); - assert_eq!(exec_substring(&str_value, &start_value, &length_value), expected_val); + assert_eq!( + exec_substring(&str_value, &start_value, &length_value), + expected_val + ); let str_value = OwnedValue::Text(Rc::new("limbo".to_string())); let start_value = OwnedValue::Integer(10); let length_value = OwnedValue::Null; let expected_val = OwnedValue::Text(Rc::new(String::from(""))); - } } diff --git a/sqlite3/include/sqlite3.h b/sqlite3/include/sqlite3.h index aa942c7fe..6a95c7b01 100644 --- a/sqlite3/include/sqlite3.h +++ b/sqlite3/include/sqlite3.h @@ -243,7 +243,7 @@ const char *sqlite3_libversion(void); int sqlite3_libversion_number(void); #ifdef __cplusplus -} // extern "C" -#endif // __cplusplus +} // extern "C" +#endif // __cplusplus -#endif /* LIMBO_SQLITE3_H */ \ No newline at end of file +#endif /* LIMBO_SQLITE3_H */