Replace Sex::gen with Rng::gen

bouzuya · Dec 5, 2023 · 4230550 · 4230550
1 parent 14a2d7a
commit 4230550
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/infrastructure/namegen.rs b/src/infrastructure/namegen.rs
@@ -136,7 +136,8 @@ async fn gen_names(sex: Sex) -> anyhow::Result<Names> {
 impl GeneratePiUseCase for NamesCache {
     #[tracing::instrument(skip(self), err, ret)]
     async fn generate_pi(&self, kana_form: KanaForm) -> Result<PI, GenPiError> {
-        let sex = Sex::gen();
+        let mut rng = rand::rngs::OsRng;
+        let sex = rng.gen::<Sex>();
         let name = NameGenerator::generate(self, sex)
             .await
             .map_err(GenPiError::GenNameError)?;

diff --git a/src/model/sex.rs b/src/model/sex.rs
@@ -1,18 +1,10 @@
-use rand::{thread_rng, Rng};
-
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, serde::Serialize)]
 #[serde(rename_all = "lowercase")]
 pub enum Sex {
     Female,
     Male,
 }
 
-impl Sex {
-    pub fn gen() -> Self {
-        [Self::Female, Self::Male][thread_rng().gen_range(0..1)]
-    }
-}
-
 impl rand::distributions::Distribution<Sex> for rand::distributions::Standard {
     fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> Sex {
         if rng.gen::<bool>() {
@@ -27,6 +19,8 @@ impl rand::distributions::Distribution<Sex> for rand::distributions::Standard {
 mod tests {
     use std::collections::HashSet;
 
+    use rand::Rng;
+
     use super::*;
 
     #[test]