From a42744434d9f64a8d97d4217054d64a2923df15f Mon Sep 17 00:00:00 2001 From: leca Date: Wed, 13 Mar 2024 01:05:02 +0300 Subject: [PATCH] some formatting --- src/game.rs | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/game.rs b/src/game.rs index 64a7e3f..4401de8 100644 --- a/src/game.rs +++ b/src/game.rs @@ -5,6 +5,7 @@ pub enum Kanas { Hiragana, Katakana } + pub struct Hieroglyph {syllable: String, row: usize, column: usize} impl std::fmt::Display for Hieroglyph { @@ -63,21 +64,21 @@ const KATAKANA: [[&str; 5]; 11] = [ pub fn get_kana_pair_for_hieroglyph(k: Kanas, h: &Hieroglyph) -> Hieroglyph { match k { - Kanas::Hiragana => Hieroglyph{ - syllable: HIRAGANA[h.row][h.column].to_string(), - row: h.row, - column: h.column - }, - Kanas::Katakana => Hieroglyph{ - syllable: KATAKANA[h.row][h.column].to_string(), - row: h.row, - column: h.column - }, - Kanas::Romaji => Hieroglyph{ - syllable: ROMAJI[h.row][h.column].to_string(), - row: h.row, - column: h.column - }, + Kanas::Hiragana => Hieroglyph { + syllable: HIRAGANA[h.row][h.column].to_string(), + row: h.row, + column: h.column + }, + Kanas::Katakana => Hieroglyph { + syllable: KATAKANA[h.row][h.column].to_string(), + row: h.row, + column: h.column + }, + Kanas::Romaji => Hieroglyph { + syllable: ROMAJI[h.row][h.column].to_string(), + row: h.row, + column: h.column + }, } } @@ -85,13 +86,12 @@ pub fn generate_random_hieroglyph(k: Kanas) -> Hieroglyph { let row: usize = rand::thread_rng().gen_range(0..ROMAJI.len()-1); let column: usize = rand::thread_rng().gen_range(0..ROMAJI[0].len()-1); - let generated: String = { - match k { - Kanas::Romaji => ROMAJI[row][column].to_string(), - Kanas::Hiragana => HIRAGANA[row][column].to_string(), - Kanas::Katakana => KATAKANA[row][column].to_string() - } + let generated: String = match k { + Kanas::Romaji => ROMAJI[row][column].to_string(), + Kanas::Hiragana => HIRAGANA[row][column].to_string(), + Kanas::Katakana => KATAKANA[row][column].to_string() }; + if generated == "0" { return generate_random_hieroglyph(k); }