diff options
author | 林炳权 <695601626@qq.com> | 2023-08-27 12:04:12 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-26 22:04:12 -0600 |
commit | 2080669943e79aba619bc80829172c696ec1f15c (patch) | |
tree | 9eb317754a9632220abb3df238a30375164d705a /ext/kv/sqlite.rs | |
parent | e4cebf3e0da539321727b0f0e43ddce5679635b1 (diff) |
chore: update to Rust 1.72 (#20258)
<!--
Before submitting a PR, please read https://deno.com/manual/contributing
1. Give the PR a descriptive title.
Examples of good title:
- fix(std/http): Fix race condition in server
- docs(console): Update docstrings
- feat(doc): Handle nested reexports
Examples of bad title:
- fix #7123
- update docs
- fix bugs
2. Ensure there is a related issue and it is referenced in the PR text.
3. Ensure there are tests that cover the changes.
4. Ensure `cargo test` passes.
5. Ensure `./tools/format.js` passes without changing files.
6. Ensure `./tools/lint.js` passes.
7. Open as a draft PR if your work is still in progress. The CI won't
run
all steps, but you can add '[ci]' to a commit message to force it to.
8. If you would like to run the benchmarks on the CI, add the 'ci-bench'
label.
-->
As the title.
---------
Co-authored-by: Matt Mastracci <matthew@mastracci.com>
Diffstat (limited to 'ext/kv/sqlite.rs')
-rw-r--r-- | ext/kv/sqlite.rs | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/ext/kv/sqlite.rs b/ext/kv/sqlite.rs index f67154cb4..ea46aae32 100644 --- a/ext/kv/sqlite.rs +++ b/ext/kv/sqlite.rs @@ -355,7 +355,7 @@ impl SqliteDb { spawn_blocking(move || { let mut db = db.try_lock().ok(); let Some(db) = db.as_mut().and_then(|x| x.as_mut()) else { - return Err(type_error(ERROR_USING_CLOSED_DATABASE)) + return Err(type_error(ERROR_USING_CLOSED_DATABASE)); }; let result = match db.transaction() { Ok(tx) => f(tx), @@ -626,16 +626,17 @@ impl SqliteQueue { tx: &rusqlite::Transaction<'_>, ) -> Result<bool, AnyError> { let Some((_, id, data, backoff_schedule, keys_if_undelivered)) = tx - .prepare_cached(STATEMENT_QUEUE_GET_RUNNING_BY_ID)? - .query_row([id], |row| { - let deadline: u64 = row.get(0)?; - let id: String = row.get(1)?; - let data: Vec<u8> = row.get(2)?; - let backoff_schedule: String = row.get(3)?; - let keys_if_undelivered: String = row.get(4)?; - Ok((deadline, id, data, backoff_schedule, keys_if_undelivered)) - }) - .optional()? else { + .prepare_cached(STATEMENT_QUEUE_GET_RUNNING_BY_ID)? + .query_row([id], |row| { + let deadline: u64 = row.get(0)?; + let id: String = row.get(1)?; + let data: Vec<u8> = row.get(2)?; + let backoff_schedule: String = row.get(3)?; + let keys_if_undelivered: String = row.get(4)?; + Ok((deadline, id, data, backoff_schedule, keys_if_undelivered)) + }) + .optional()? + else { return Ok(false); }; @@ -926,7 +927,9 @@ fn mutate_le64( mutate: impl FnOnce(u64, u64) -> u64, ) -> Result<(), AnyError> { let Value::U64(operand) = *operand else { - return Err(type_error(format!("Failed to perform '{op_name}' mutation on a non-U64 operand"))); + return Err(type_error(format!( + "Failed to perform '{op_name}' mutation on a non-U64 operand" + ))); }; let old_value = tx |