ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-10-09 04:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

clippy::manual_let_else

Browse Source
This commit is contained in:
gwenn
2024-08-10 14:46:49 +02:00
parent 0c3933b68c
commit f2ee7018ef
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rusqlite-macros/src/lib.rs
View File

@@ -27,9 +27,8 @@ fn try_bind(input: TokenStream) -> Result<TokenStream> {
(stmt, literal) (stmt, literal)
}; };
let literal = match into_literal(&literal) { let Some(literal) = into_literal(&literal) else {
Some(it) => it, return Err("expected a plain string literal".to_string());
None => return Err("expected a plain string literal".to_string()),
}; };
let call_site = literal.span(); let call_site = literal.span();
let string_lit = match StringLit::try_from(literal) { let string_lit = match StringLit::try_from(literal) {

5
src/context.rs
View File

@@ -55,10 +55,9 @@ pub(super) unsafe fn set_result(
if length > c_int::MAX as usize { if length > c_int::MAX as usize {
ffi::sqlite3_result_error_toobig(ctx); ffi::sqlite3_result_error_toobig(ctx);
} else { } else {
let (c_str, len, destructor) = match str_for_sqlite(s) { let Ok((c_str, len, destructor)) = str_for_sqlite(s) else {
Ok(c_str) => c_str,
// TODO sqlite3_result_error // TODO sqlite3_result_error
Err(_) => return ffi::sqlite3_result_error_code(ctx, ffi::SQLITE_MISUSE), return ffi::sqlite3_result_error_code(ctx, ffi::SQLITE_MISUSE);
}; };
// TODO sqlite3_result_text64 // 3.8.7 // TODO sqlite3_result_text64 // 3.8.7
ffi::sqlite3_result_text(ctx, c_str, len, destructor); ffi::sqlite3_result_text(ctx, c_str, len, destructor);

8
src/functions.rs
View File

@@ -691,9 +691,7 @@ unsafe extern "C" fn call_boxed_step<A, D, T>(
D: Aggregate<A, T>, D: Aggregate<A, T>,
T: SqlFnOutput, T: SqlFnOutput,
{ {
let pac = if let Some(pac) = aggregate_context(ctx, std::mem::size_of::<*mut A>()) { let Some(pac) = aggregate_context(ctx, std::mem::size_of::<*mut A>()) else {
pac
} else {
ffi::sqlite3_result_error_nomem(ctx); ffi::sqlite3_result_error_nomem(ctx);
return; return;
}; };
@@ -739,9 +737,7 @@ unsafe extern "C" fn call_boxed_inverse<A, W, T>(
W: WindowAggregate<A, T>, W: WindowAggregate<A, T>,
T: SqlFnOutput, T: SqlFnOutput,
{ {
let pac = if let Some(pac) = aggregate_context(ctx, std::mem::size_of::<*mut A>()) { let Some(pac) = aggregate_context(ctx, std::mem::size_of::<*mut A>()) else {
pac
} else {
ffi::sqlite3_result_error_nomem(ctx); ffi::sqlite3_result_error_nomem(ctx);
return; return;
}; };