From 2c6fa76437f3dcc6a57b4e70960b244c9acd2959 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 24 Aug 2025 14:13:20 +0300 Subject: [PATCH] cargo fmt --- core/lib.rs | 2 +- core/storage/database.rs | 6 +----- core/storage/pager.rs | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/core/lib.rs b/core/lib.rs index 5ba3a4faa..e8842527c 100644 --- a/core/lib.rs +++ b/core/lib.rs @@ -75,7 +75,7 @@ use std::{ }; #[cfg(feature = "fs")] use storage::database::DatabaseFile; -pub use storage::encryption::{EncryptionKey, EncryptionContext}; +pub use storage::encryption::{EncryptionContext, EncryptionKey}; use storage::page_cache::DumbLruPageCache; use storage::pager::{AtomicDbState, DbState}; use storage::sqlite3_ondisk::PageSize; diff --git a/core/storage/database.rs b/core/storage/database.rs index d608558fc..b13962d30 100644 --- a/core/storage/database.rs +++ b/core/storage/database.rs @@ -184,11 +184,7 @@ impl DatabaseFile { } } -fn encrypt_buffer( - page_idx: usize, - buffer: Arc, - ctx: &EncryptionContext, -) -> Arc { +fn encrypt_buffer(page_idx: usize, buffer: Arc, ctx: &EncryptionContext) -> Arc { let encrypted_data = ctx.encrypt_page(buffer.as_slice(), page_idx).unwrap(); Arc::new(Buffer::new(encrypted_data.to_vec())) } diff --git a/core/storage/pager.rs b/core/storage/pager.rs index 4512b93c7..b4dd8f2f0 100644 --- a/core/storage/pager.rs +++ b/core/storage/pager.rs @@ -28,9 +28,7 @@ use super::btree::{btree_init_page, BTreePage}; use super::page_cache::{CacheError, CacheResizeResult, DumbLruPageCache, PageCacheKey}; use super::sqlite3_ondisk::begin_write_btree_page; use super::wal::CheckpointMode; -use crate::storage::encryption::{ - EncryptionKey, EncryptionContext, ENCRYPTION_METADATA_SIZE, -}; +use crate::storage::encryption::{EncryptionContext, EncryptionKey, ENCRYPTION_METADATA_SIZE}; /// SQLite's default maximum page count const DEFAULT_MAX_PAGE_COUNT: u32 = 0xfffffffe;