code cleanup

src/writing.rs

@@ -1,11 +1,11 @@
 use crate::lang::KanaSet;
-use crate::{ RootMessage};
+use crate::navigation::Page::PreviousPage;
+use crate::navigation::{NavigatedPage, Page};
+use crate::styling::*;
+use crate::RootMessage;
 use iced::widget::*;
 use iced::{alignment, Element, Fill, Task};
 use rand::seq::SliceRandom;
-use crate::navigation::{NavigatedPage, Page};
-use crate::navigation::Page::PreviousPage;
-use crate::styling::*;
 
 #[derive(Clone, Debug)]
 pub struct WritingState {
@@ -45,7 +45,7 @@ impl WritingState {
 }
 
 impl WritingState {
-    pub fn update(&mut self, message: WritingMessage) -> Task<RootMessage>  {
+    pub fn update(&mut self, message: WritingMessage) -> Task<RootMessage> {
         match message {
             WritingMessage::Back => todo!(),
             WritingMessage::Next => self.next(),
@@ -66,7 +66,6 @@ impl WritingState {
         }
 
         if self.show_all {
-
             if self.set.is_empty() == false && self.kana_total.is_empty() == false {
                 self.set.clear();
             }
@@ -75,8 +74,6 @@ impl WritingState {
                 self.roman_total += &*format!("{} ", &pair.1.clone()).to_string();
                 self.kana_total += &*format!("{} ", &pair.0).to_string();
             }
-
-
         } else {
             let current = self.set.pop().unwrap();
             self.kana_total += &*format!("{} ", &current.0).to_string();
@@ -95,8 +92,12 @@ impl WritingState {
                 text!("{}", self.kana).size(48),
                 self.answers(),
                 row![
-                    button(text!("{}", self.next_text)).style(jl_button).on_press(WritingMessage::Next),
-                    button("Закончить").style(jl_button).on_press(WritingMessage::Back),
+                    button(text!("{}", self.next_text))
+                        .style(jl_button)
+                        .on_press(WritingMessage::Next),
+                    button("Закончить")
+                        .style(jl_button)
+                        .on_press(WritingMessage::Back),
                 ]
                 .spacing(DEFAULT_SPACING)
             ]
@@ -110,7 +111,7 @@ impl WritingState {
     }
 
     fn answers(&self) -> Element<'_, WritingMessage> {
-        if self.set.is_empty()  {
+        if self.set.is_empty() {
             text!("{}", self.kana_total).size(36).into()
         } else {
             space().height(36).into()