code: cargo fmt

Author: bragefuglseth

src/main.rs

@@ -20,10 +20,10 @@
 mod application;
 mod config;
 mod discord_rpc;
-mod typing_test_utils;
 mod settings;
 mod text_generation;
 mod text_utils;
+mod typing_test_utils;
 mod widgets;
 
 use self::application::KpApplication;

src/text_generation.rs

@@ -154,8 +154,7 @@ type Numerals = [&'static str; 10];
 
 const WESTERN_ARABIC_NUMERALS: &'static Numerals =
     &["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
-const PERSIAN_NUMERALS: &'static Numerals =
-    &["۰", "۱", "۲", "۳", "۴", "۵", "۶", "۷", "۸", "۹"];
+const PERSIAN_NUMERALS: &'static Numerals = &["۰", "۱", "۲", "۳", "۴", "۵", "۶", "۷", "۸", "۹"];
 const DEVANAGARI_NUMERALS: &'static Numerals = &["०", "१", "२", "३", "४", "५", "६", "७", "८", "९"];
 const BANGLA_NUMERALS: &'static Numerals = &["০", "১", "২", "৩", "৪", "৫", "৬", "৭", "৮", "৯"];
 
@@ -310,7 +309,6 @@ pub fn advanced(language: Language) -> String {
                 Punctuation::suffix("؟", true, 0.3),
                 Punctuation::wrapping("\"", "\"", false, 0.0),
                 Punctuation::wrapping("(", ")", false, 0.1),
-
             ],
             PERSIAN_NUMERALS,
         ),
@@ -459,4 +457,3 @@ fn random_number_weighted(numerals: &Numerals, rng: &mut ThreadRng) -> String {
 
     s
 }
-

src/widgets/text_view.rs

@@ -196,7 +196,7 @@ mod imp {
 
             if change == TextChange::Addition {
                 let last_grapheme_state = comparison
-                   .iter()
+                    .iter()
                     .last()
                     .map(|(state, _, _, _)| *state)
                     .unwrap_or(GraphemeState::Unfinished);

src/widgets/text_view/input.rs

@@ -121,7 +121,9 @@ impl imp::KpTextView {
             #[upgrade_or]
             glib::signal::Propagation::Proceed,
             move |controller, key, _, modifier| {
-                if imp.typed_text.borrow().is_empty() { return glib::signal::Propagation::Proceed; }
+                if imp.typed_text.borrow().is_empty() {
+                    return glib::signal::Propagation::Proceed;
+                }
 
                 let obj = imp.obj();
 

src/widgets/window.rs

@@ -23,8 +23,8 @@ mod typing_test;
 
 use crate::application::KpApplication;
 use crate::config::APP_ID;
-use crate::typing_test_utils::*;
 use crate::settings;
+use crate::typing_test_utils::*;
 use crate::widgets::{KpResultsView, KpTextView};
 use adw::prelude::*;
 use adw::subclass::prelude::*;

src/widgets/window/typing_test.rs

@@ -18,9 +18,9 @@
  */
 
 use super::*;
-use crate::typing_test_utils::TestSummary;
 use crate::text_generation;
 use crate::text_utils::{process_custom_text, GraphemeState};
+use crate::typing_test_utils::TestSummary;
 use crate::widgets::{KpCustomTextDialog, KpTextLanguageDialog};
 use gettextrs::gettext;
 use glib::ControlFlow;
@@ -276,10 +276,10 @@ impl imp::KpWindow {
         let settings = app.settings();
 
         // Discord IPC
-        self.obj().kp_application().discord_rpc().set_activity(
-            TestConfig::from_settings(&settings),
-            PresenceState::Ready,
-        );
+        self.obj()
+            .kp_application()
+            .discord_rpc()
+            .set_activity(TestConfig::from_settings(&settings), PresenceState::Ready);
 
         self.end_existing_inhibit();
     }
@@ -718,13 +718,11 @@ pub(super) fn add_personal_best(
     let (new_test_type, new_duration, new_language, new_wpm) = new;
 
     old.into_iter()
-        .filter(
-            |(stored_test_type, stored_duration, stored_lang_code, _)| {
-                *stored_test_type != new_test_type
-                    || *stored_duration != new_duration
-                    || *stored_lang_code != new_language
-            },
-        )
+        .filter(|(stored_test_type, stored_duration, stored_lang_code, _)| {
+            *stored_test_type != new_test_type
+                || *stored_duration != new_duration
+                || *stored_lang_code != new_language
+        })
         .chain(once((
             new_test_type.to_string(),
             new_duration.to_string(),
@@ -733,4 +731,3 @@ pub(super) fn add_personal_best(
         )))
         .collect()
 }
-