Reformat code

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<Id> for SmallId {
     fn from(value: Id) -> Self {
         Self(value.0 as u16)
     }
-}
+}

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 {

src/data/repositories.rs

@@ -320,7 +320,8 @@ impl<T: EntityData + Clone, D: DbLayer<T>> Repository<T, D> for DataRepositoryIn
     }
 
     fn create_now(&mut self, mut new: T) -> Result<EntityHandle<T>, 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<T: EntityData + Clone, D: DbLayer<T>> Repository<T, D> for DataRepositoryIn
 
     fn start(&mut self) -> MaybeError {
         if self.version != 0 {
-            return Ok(())
+            return Ok(());
         }
 
         self.init()?;

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<WordGroup> for CustomFieldsQuerySet {
@@ -34,4 +34,4 @@ impl TableAccessQuerySet<WordGroup> for CustomFieldsQuerySet {
     fn update_params(entity: &WordGroup) -> impl Params {
         (&entity.name, entity.id)
     }
-}
+}

src/data_provider/decks.rs

@@ -46,7 +46,13 @@ impl TableAccessQuerySet<DeckSettings> 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,
+        )
     }
 }
 

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<T> {
     fn load() -> &'static str;
@@ -44,11 +44,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
         connection
             .execute(Q::load(), Q::update_params(entity))
             .map_err(|_| DbSaveError)?;
-        debug!(
+        debug!("Updated in {} for {:?}", Q::name(), time.elapsed());
-            "Updated in {} for {:?}",
-            Q::name(),
-            time.elapsed()
-        );
         Ok(())
     }
 
@@ -60,11 +56,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
             .map_err(|_| DbSaveError)?;
 
         entity.set_id(index.into());
-        debug!(
+        debug!("Added into {} for {:?}", Q::name(), time.elapsed());
-            "Added into {} for {:?}",
-            Q::name(),
-            time.elapsed()
-        );
         Ok(())
     }
 
@@ -80,11 +72,7 @@ impl<T: EntityData, Q: TableAccessQuerySet<T>> DbLayer<T> for SqliteDbLayer<T, Q
                 (&id,),
             )
             .map_err(|_| DbSaveError)?;
-        debug!(
+        debug!("Deleted from {} for {:?}", Q::name(), time.elapsed());
-            "Deleted from {} for {:?}",
-            Q::name(),
-            time.elapsed()
-        );
         Ok(())
     }
 

src/data_provider/word_groups.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 WordGroupQuerySet;
 impl TableAccessQuerySet<WordGroup> for WordGroupQuerySet {
@@ -34,4 +34,4 @@ impl TableAccessQuerySet<WordGroup> for WordGroupQuerySet {
     fn update_params(entity: &WordGroup) -> impl Params {
         (&entity.name, entity.id)
     }
-}
+}

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<WordData> for WordQuerySet {
@@ -31,8 +31,7 @@ impl TableAccessQuerySet<WordData> for WordQuerySet {
             key: row.get(1)?,
             value: row.get(2)?,
             tags: row.get(3)?,
-            additional: serde_json::from_str(&additional)
+            additional: serde_json::from_str(&additional).unwrap_or_default(),
-                .unwrap_or_default(),
             group_id: row.get(5)?,
         })
     }
@@ -153,8 +152,7 @@ pub fn load_words(connection: &Connection) -> Result<Vec<WordData>, Notification
                 key: row.get(1)?,
                 value: row.get(2)?,
                 tags: row.get(3)?,
-                additional: serde_json::from_str(&additional)
+                additional: serde_json::from_str(&additional).unwrap_or_default(),
-                    .unwrap_or_default(),
                 group_id: row.get(5)?,
             })
         })