apply new style

src/data_provider/import.rs

@@ -1,11 +1,11 @@
 use crate::helpers::into_result;
 use crate::notification::NotificationData;
 use crate::notification::NotificationData::IncorrectAnkiFile;
+use crate::pages::import::AnkiSchema;
 use log::info;
 use rusqlite::Connection;
 use serde_json::Value;
 use std::collections::BTreeMap;
-use crate::pages::import::AnkiSchema;
 
 #[derive(Clone)]
 pub struct ImportData(pub(crate) Vec<ImportGroup>);
@@ -26,14 +26,13 @@ pub struct ImportNote {
     pub fields: Vec<String>,
 }
 
-pub fn load_groups(connection: &Connection, schema: AnkiSchema) -> Result<ImportData, NotificationData> {
+pub fn load_groups(
+    connection: &Connection,
+    schema: AnkiSchema,
+) -> Result<ImportData, NotificationData> {
     match schema {
-        AnkiSchema::Old => {
-            load_old_schema(connection)
-        }
-        AnkiSchema::Beta => {
-            load_new_schema(connection)
-        }
+        AnkiSchema::Old => load_old_schema(connection),
+        AnkiSchema::Beta => load_new_schema(connection),
     }
 }
 

src/data_provider/words.rs

@@ -1,6 +1,6 @@
+use crate::data::Id;
 use crate::data::entities::WordData;
 use crate::data::repositories::{DataRepository, DataRepositoryInner};
-use crate::data::Id;
 use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
 use litemap::LiteMap;
 use rusqlite::{Error, Params, Row};
@@ -70,24 +70,34 @@ fn additional_to_string(map: &LiteMap<Id, String>) -> String {
 }
 
 fn additional_from_string_temp(data: String) -> LiteMap<Id, String> {
-
-    let pre_map : LiteMap<String, String> = serde_json::from_str(data.as_str()).unwrap();
-    LiteMap::from(pre_map.iter().map(|(k, v)| (match k.as_str() {
-        "reading" => Id(1),
-        "description" => Id(2),
-        "context" => Id(3),
-        &_ => Id(0) }, v.to_string())).collect())
+    let pre_map: LiteMap<String, String> = serde_json::from_str(data.as_str()).unwrap();
+    LiteMap::from(
+        pre_map
+            .iter()
+            .map(|(k, v)| {
+                (
+                    match k.as_str() {
+                        "reading" => Id(1),
+                        "description" => Id(2),
+                        "context" => Id(3),
+                        &_ => Id(0),
+                    },
+                    v.to_string(),
+                )
+            })
+            .collect(),
+    )
 }
 
 fn additional_from_string(data: String) -> LiteMap<Id, String> {
     if data.is_empty() {
-        return LiteMap::new()
+        return LiteMap::new();
     }
     let parts = data.split('').collect::<Vec<&str>>();
     let chunks = parts.chunks(2).collect::<Vec<&[&str]>>();
     let mut map = LiteMap::with_capacity(parts.len());
     for part in &chunks {
-        let id : Id = part[0].parse().unwrap();
+        let id: Id = part[0].parse().unwrap();
         let value: String = part[1].to_string();
         map.insert(id, value);
     }