ref(mod): rename modules

Author: t-webber

src/clap.rs

@@ -6,7 +6,8 @@ use clap::Parser;
 
 use crate::dialog::Dialog;
 use crate::errors::{Error, Res};
-use crate::generator::{Data, Generator as _};
+use crate::data::Data;
+use crate::generator_trait::Generator as _;
 use crate::json::JsonArgs;
 
 /// CLI to generate some fake data under JSON format.

src/generator.rs src/data.rssrc/generator.rs renamed to src/data.rs

@@ -10,20 +10,8 @@ use serde_json::{Number, Value};
 
 use crate::data_generator::RandomDataGenerator;
 use crate::errors::{Error, Res};
-///
-/// Generate random data of the given type.
-pub trait Generator<T>: Sized {
-    /// Generate random data of the given type.
-    fn generate(&self, data: &mut Data) -> Res<T>;
-}
+use crate::generator_trait::{Generator, NullableGenerator};
 
-/// Generate random data of the given type, but with a nullable type.
-pub trait NullableGenerator<T>: Sized {
-    /// Generate random data of the given type, but with a nullable type.
-    ///
-    /// This can sometimes returns None.
-    fn generate_nullable(&self, data: &mut Data) -> Res<Option<T>>;
-}
 
 /// Contains the list of data types and the random generator to apply
 /// generators.

src/dialog/mod.rs

@@ -2,11 +2,12 @@
 
 //pub mod range;
 
-use dialoguer::FuzzySelect;
 use dialoguer::theme::ColorfulTheme as ColourfulTheme;
+use dialoguer::FuzzySelect;
 
+use crate::data::Data;
 use crate::errors::Res;
-use crate::generator::{Data, Generator as _};
+use crate::generator_trait::Generator as _;
 
 /// Dialog to fuzzy search, select and generate some data of a data type.
 pub struct Dialog;

src/generator_trait.rs

@@ -0,0 +1,18 @@
+//! Traits to make structs generate some data in a formatted way.
+
+use crate::data::Data;
+use crate::errors::Res;
+
+/// Generate random data of the given type.
+pub trait Generator<T>: Sized {
+    /// Generate random data of the given type.
+    fn generate(&self, data: &mut Data) -> Res<T>;
+}
+
+/// Generate random data of the given type, but with a nullable type.
+pub trait NullableGenerator<T>: Sized {
+    /// Generate random data of the given type, but with a nullable type.
+    ///
+    /// This can sometimes returns None.
+    fn generate_nullable(&self, data: &mut Data) -> Res<Option<T>>;
+}

src/json/generator.rs

@@ -4,8 +4,9 @@ use core::iter::repeat_with;
 
 use serde_json::{Map, Value};
 
+use crate::data::Data;
 use crate::errors::{Error, Res};
-use crate::generator::{Data, Generator, NullableGenerator};
+use crate::generator_trait::{Generator, NullableGenerator};
 
 impl Generator<Value> for Map<String, Value> {
     fn generate(&self, data: &mut Data) -> Res<Value> {

src/json/mod.rs

@@ -6,8 +6,9 @@ use core::fmt::Write as _;
 
 use serde_json::Value;
 
+use crate::data::Data;
 use crate::errors::{Error, Res};
-use crate::generator::{Data, NullableGenerator as _};
+use crate::generator_trait::NullableGenerator as _;
 
 /// Arguments for generating JSON data based on a schema file.
 pub struct JsonArgs {

src/main.rs

@@ -42,10 +42,11 @@
 #![allow(clippy::unwrap_in_result, reason = "unwrap_used is active")]
 
 mod clap;
+mod data;
 mod data_generator;
 mod dialog;
 mod errors;
-mod generator;
+mod generator_trait;
 mod json;
 
 fn main() {