Remove Option<T> for EntityType

ziteh · Nov 14, 2023 · fbf241a · fbf241a
1 parent 8636dac
commit fbf241a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/elebox-cli/Cargo.toml b/elebox-cli/Cargo.toml
@@ -1,6 +1,10 @@
 [package]
 name = "elebox-cli"
 version = "0.1.0"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/ziteh/elebox"
+authors = ["ZiTe <[email protected]>"]
+readme = "README.md"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/elebox-cli/src/main.rs b/elebox-cli/src/main.rs
@@ -8,7 +8,7 @@ struct Cli {
     #[arg(default_value = "elebox.db")]
     db: String,
     #[clap(subcommand)]
-    entity_type: Option<EntityType>,
+    entity_type: EntityType,
 }
 
 #[derive(Debug, Subcommand)]
@@ -17,7 +17,7 @@ enum EntityType {
     Part(PartCommand),
     /// Edit or list part type
     Type(TypeCommand),
-    /// Create a new database
+    /// Create and init a new database
     Init,
 }
 
@@ -125,10 +125,9 @@ fn main() {
     println!("{}", cli.db);
 
     match &cli.entity_type {
-        Some(EntityType::Init) => elebox_core::init(&cli.db),
-        Some(EntityType::Part(p_cmd)) => part_cmd(&cli.db, p_cmd),
-        Some(EntityType::Type(t_cmd)) => type_cmd(&cli.db, t_cmd),
-        None => {}
+        EntityType::Init => elebox_core::init(&cli.db),
+        EntityType::Part(p_cmd) => part_cmd(&cli.db, p_cmd),
+        EntityType::Type(t_cmd) => type_cmd(&cli.db, t_cmd),
     };
 }
 

diff --git a/elebox-core/Cargo.toml b/elebox-core/Cargo.toml
@@ -1,6 +1,10 @@
 [package]
 name = "elebox-core"
 version = "0.1.0"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/ziteh/elebox"
+authors = ["ZiTe <[email protected]>"]
+readme = "README.md"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/elebox-gui/Cargo.toml b/elebox-gui/Cargo.toml
@@ -1,10 +1,14 @@
 [package]
 name = "elebox-gui"
 version = "0.1.0"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/ziteh/elebox"
+authors = ["ZiTe <[email protected]>"]
+readme = "README.md"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 elebox-core = { path = "../elebox-core" }
-iced = "0.10" # GUI
+iced = "0.10"                             # GUI