From 29a90d48d9634480f164ed823c0138cc80f4faee Mon Sep 17 00:00:00 2001 From: Mikhail Mitrofanov Date: Mon, 31 Aug 2026 11:26:05 +0300 Subject: [PATCH] Reformat code --- src/data.rs | 6 +++--- src/data/entities.rs | 2 +- src/data/repositories.rs | 5 +++-- src/data_provider/custom_fields.rs | 4 ++-- src/data_provider/decks.rs | 8 +++++++- src/data_provider/mod.rs | 22 +++++----------------- src/data_provider/word_groups.rs | 4 ++-- src/data_provider/words.rs | 8 +++----- 8 files changed, 26 insertions(+), 33 deletions(-) diff --git a/src/data.rs b/src/data.rs index 9128cac..f6e2374 100644 --- a/src/data.rs +++ b/src/data.rs @@ -3,7 +3,7 @@ pub mod repositories; use rusqlite::ToSql; use rusqlite::types::{FromSql, FromSqlError, FromSqlResult, ToSqlOutput, ValueRef}; -use std::fmt::{write, Display, Formatter}; +use std::fmt::{Display, Formatter, write}; use std::num::ParseIntError; use std::str::FromStr; @@ -63,7 +63,7 @@ macro_rules! id_impl { self.0 != 0 } } - } + }; } id_impl!(u32, Id, INVALID_ID); @@ -79,4 +79,4 @@ impl From for SmallId { fn from(value: Id) -> Self { Self(value.0 as u16) } -} \ No newline at end of file +} diff --git a/src/data/entities.rs b/src/data/entities.rs index 7410848..816bd02 100644 --- a/src/data/entities.rs +++ b/src/data/entities.rs @@ -3,13 +3,13 @@ use crate::core::srs::{FADE_PER_DAY, MAX_SCORE, OrderMode, WordOpenMode}; use crate::data::{INVALID_ID, Id}; use chrono::{DateTime, NaiveDate, Utc}; use fsrs::MemoryState; +use litemap::LiteMap; use log::info; use rayon::prelude::*; use rhai::{Engine, Scope}; use std::cmp::Ordering; use std::marker::PhantomData; use std::time::Instant; -use litemap::LiteMap; #[derive(Clone, Debug)] pub struct WordData { diff --git a/src/data/repositories.rs b/src/data/repositories.rs index 8315de2..971c5df 100644 --- a/src/data/repositories.rs +++ b/src/data/repositories.rs @@ -320,7 +320,8 @@ impl> Repository for DataRepositoryIn } fn create_now(&mut self, mut new: T) -> Result, NotificationData> { - self.data_layer.add_entity(&mut new, &self.connection.read())?; + self.data_layer + .add_entity(&mut new, &self.connection.read())?; let index = self.cache.len(); let handle = EntityHandle::new(new.id(), index, true); self.cache.push(new); @@ -378,7 +379,7 @@ impl> Repository for DataRepositoryIn fn start(&mut self) -> MaybeError { if self.version != 0 { - return Ok(()) + return Ok(()); } self.init()?; diff --git a/src/data_provider/custom_fields.rs b/src/data_provider/custom_fields.rs index c39a659..2cb9e0a 100644 --- a/src/data_provider/custom_fields.rs +++ b/src/data_provider/custom_fields.rs @@ -1,6 +1,6 @@ -use rusqlite::{Error, Params, Row}; use crate::data::entities::WordGroup; use crate::data_provider::TableAccessQuerySet; +use rusqlite::{Error, Params, Row}; pub struct CustomFieldsQuerySet; impl TableAccessQuerySet for CustomFieldsQuerySet { @@ -34,4 +34,4 @@ impl TableAccessQuerySet for CustomFieldsQuerySet { fn update_params(entity: &WordGroup) -> impl Params { (&entity.name, entity.id) } -} \ No newline at end of file +} diff --git a/src/data_provider/decks.rs b/src/data_provider/decks.rs index 2c8f795..11526a2 100644 --- a/src/data_provider/decks.rs +++ b/src/data_provider/decks.rs @@ -46,7 +46,13 @@ impl TableAccessQuerySet for DeckQuerySet { } fn update_params(entity: &DeckSettings) -> impl Params { - (&entity.name, &entity.forward, &entity.backward, &entity.filter, entity.id) + ( + &entity.name, + &entity.forward, + &entity.backward, + &entity.filter, + entity.id, + ) } } diff --git a/src/data_provider/mod.rs b/src/data_provider/mod.rs index a7979f6..adffc77 100644 --- a/src/data_provider/mod.rs +++ b/src/data_provider/mod.rs @@ -9,6 +9,7 @@ use std::marker::PhantomData; use std::time::Instant; pub(crate) mod card_states; +pub mod custom_fields; pub(crate) mod decks; pub(crate) mod history; pub(crate) mod import; @@ -16,9 +17,8 @@ pub(crate) mod settings; pub(crate) mod sqlite; pub(crate) mod voice; pub(crate) mod web_api; -pub(crate) mod words; pub mod word_groups; -pub mod custom_fields; +pub(crate) mod words; pub trait TableAccessQuerySet { fn load() -> &'static str; @@ -44,11 +44,7 @@ impl> DbLayer for SqliteDbLayer> DbLayer for SqliteDbLayer> DbLayer for SqliteDbLayer for WordGroupQuerySet { @@ -34,4 +34,4 @@ impl TableAccessQuerySet for WordGroupQuerySet { fn update_params(entity: &WordGroup) -> impl Params { (&entity.name, entity.id) } -} \ No newline at end of file +} diff --git a/src/data_provider/words.rs b/src/data_provider/words.rs index 53658df..e32e066 100644 --- a/src/data_provider/words.rs +++ b/src/data_provider/words.rs @@ -2,9 +2,9 @@ use crate::data::entities::{WordData, WordGroup}; use crate::data_provider::TableAccessQuerySet; use crate::notification::NotificationData::{DbLoadError, DbSaveError}; use crate::notification::{MaybeError, NotificationData}; +use litemap::LiteMap; use rusqlite::{Connection, Error, Params, Row, params}; use std::collections::HashMap; -use litemap::LiteMap; pub struct WordQuerySet; impl TableAccessQuerySet for WordQuerySet { @@ -31,8 +31,7 @@ impl TableAccessQuerySet for WordQuerySet { key: row.get(1)?, value: row.get(2)?, tags: row.get(3)?, - additional: serde_json::from_str(&additional) - .unwrap_or_default(), + additional: serde_json::from_str(&additional).unwrap_or_default(), group_id: row.get(5)?, }) } @@ -153,8 +152,7 @@ pub fn load_words(connection: &Connection) -> Result, Notification key: row.get(1)?, value: row.get(2)?, tags: row.get(3)?, - additional: serde_json::from_str(&additional) - .unwrap_or_default(), + additional: serde_json::from_str(&additional).unwrap_or_default(), group_id: row.get(5)?, }) })