rustfmt

src/game.rs

@@ -103,7 +103,7 @@ const KATAKANA: KanaCharacters = [
     ["サ", "シ", "ス", "セ", "ソ"],
     ["タ", "チ", "ツ", "テ", "ト"],
     ["ナ", "ニ", "ヌ", "ネ", "ノ"],
-    ["ハ", "ヒ", "フ", "ヘ", "ホ"], 
+    ["ハ", "ヒ", "フ", "ヘ", "ホ"],
     ["マ", "ミ", "ム", "メ", "モ"],
     ["ヤ", OBS, "ユ", OBS, "ヨ"],
     ["ラ", "リ", "ル", "レ", "ロ"],
@@ -199,4 +199,4 @@ pub fn generate_question_text(question: &Hieroglyph, exact_kana: &Kanas) -> Stri
             )
         }
     });
-}
+}

src/labled_switch/imp.rs

@@ -38,13 +38,15 @@ impl ObjectImpl for LabledSwitch {
         self.parent_constructed();
 
         let l: &Label = self.label_obj.as_ref();
-        self.obj().bind_property("label_text", l, "label").sync_create().build();
+        self.obj()
+            .bind_property("label_text", l, "label")
+            .sync_create()
+            .build();
     }
 
     fn dispose(&self) {
         self.dispose_template();
     }
-
 }
 
-impl WidgetImpl for LabledSwitch { }
+impl WidgetImpl for LabledSwitch {}

src/labled_switch/mod.rs

@@ -1,7 +1,11 @@
 mod imp;
 
 use glib::Object;
-use gtk::{gio, glib::{self, subclass::types::ObjectSubclassIsExt}, Label, Switch};
+use gtk::{
+    gio,
+    glib::{self, subclass::types::ObjectSubclassIsExt},
+    Label, Switch,
+};
 
 glib::wrapper! {
     pub struct LabledSwitch(ObjectSubclass<imp::LabledSwitch>)
@@ -21,4 +25,4 @@ impl LabledSwitch {
     pub fn get_label(&self) -> &Label {
         self.imp().label_obj.as_ref()
     }
-}
+}

src/main.rs

@@ -4,14 +4,13 @@ mod ui;
 
 use crate::ui::menu::MenuScene;
 
+use gtk::{gio, glib, Application};
 use gtk::{prelude::*, ApplicationWindow};
-use gtk::{glib, Application, gio};
 
 const APP_ID: &str = "org.foxarmy.learn-hieroglyph";
 
 fn main() -> glib::ExitCode {
-    gio::resources_register_include!("compiled.gresource")
+    gio::resources_register_include!("compiled.gresource").expect("Cannot include gresources");
-        .expect("Cannot include gresources");
 
     let app: Application = Application::builder().application_id(APP_ID).build();
 
@@ -20,7 +19,7 @@ fn main() -> glib::ExitCode {
     app.run()
 }
 
-fn test_ui (app: &Application) {
+fn test_ui(app: &Application) {
     let window: ApplicationWindow = MenuScene::new(app).into();
 
     window.present();

src/ui/cards/edit/imp.rs

@@ -0,0 +1 @@
+

src/ui/cards/game/imp.rs

@@ -0,0 +1 @@
+