From 1f2072e07a7e8b52f3a70453e7216b2b81590ba1 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 20 Nov 2021 10:20:33 +0200 Subject: chore: bump dependency on rusqlite to 0.26.1 and fix breakage Sponsored-by: author --- src/generation.rs | 10 +++++----- src/index.rs | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/generation.rs b/src/generation.rs index de2ea10..33750ca 100644 --- a/src/generation.rs +++ b/src/generation.rs @@ -351,8 +351,8 @@ mod sql { } fn row_to_key_value(row: &Row) -> rusqlite::Result<(String, String)> { - let key: String = row.get(row.column_index("key")?)?; - let value: String = row.get(row.column_index("value")?)?; + let key: String = row.get("key")?; + let value: String = row.get("value")?; Ok((key, value)) } @@ -383,9 +383,9 @@ mod sql { } pub fn row_to_entry(row: &Row) -> rusqlite::Result<(FileId, String, String)> { - let fileno: FileId = row.get(row.column_index("fileno")?)?; - let json: String = row.get(row.column_index("json")?)?; - let reason: String = row.get(row.column_index("reason")?)?; + let fileno: FileId = row.get("fileno")?; + let json: String = row.get("json")?; + let reason: String = row.get("reason")?; Ok((fileno, json, reason)) } diff --git a/src/index.rs b/src/index.rs index 5d31068..d548396 100644 --- a/src/index.rs +++ b/src/index.rs @@ -262,20 +262,20 @@ mod sql { } fn row_to_meta(row: &Row) -> rusqlite::Result { - let hash: String = row.get(row.column_index("sha256")?)?; + let hash: String = row.get("sha256")?; let sha256 = Checksum::sha256_from_str_unchecked(&hash); - let generation: i32 = row.get(row.column_index("generation")?)?; + let generation: i32 = row.get("generation")?; let meta = if generation == 0 { ChunkMeta::new(&sha256) } else { - let ended: String = row.get(row.column_index("ended")?)?; + let ended: String = row.get("ended")?; ChunkMeta::new_generation(&sha256, &ended) }; Ok(meta) } fn row_to_id(row: &Row) -> rusqlite::Result { - let id: String = row.get(row.column_index("id")?)?; + let id: String = row.get("id")?; Ok(ChunkId::recreate(&id)) } } -- cgit v1.2.1