small refactors

.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
           ARCHIVE_TYPES: ${{ matrix.archive }}
           ARCHIVE_NAME: ${{ matrix.name }}
           UPLOAD_MODE: none
-          MINIFY: true
+          # MINIFY: true # this currently causes windows defender to block the binary
       - name: Upload artifact
         uses: actions/upload-release-asset@v1
         env:

Cargo.toml

@@ -2,7 +2,7 @@
 name = "kopfrechner"
 authors = ["Wolfgang Schwendtbauer"]
 repository = "https://github.com/Woife5/kopfrechner"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/lib.rs

@@ -17,11 +17,8 @@ pub fn run() {
             .interact_opt();
 
         let range = match range {
-            Ok(v) => match v {
-                Some(v) => Config::get_variant(v),
-                None => break,
-            },
-            Err(..) => {
+            Ok(Some(v)) => Config::get_variant(v),
+            _ => {
                 println!("No variant selected, exiting program.");
                 return;
             }
@@ -63,18 +60,16 @@ fn run_multiply(config: Config) {
                 .expect("Failed to read from stdin");
             let input_text = input_text.trim();
 
-            match input_text.parse::<usize>() {
-                Ok(i) => break i,
-                Err(..) => match input_text {
-                    "q" => break 'outer,
-                    "exit" => break 'outer,
-                    "quit" => break 'outer,
-                    _ => {
+            match input_text {
+                "q" | "exit" | "quit" => break 'outer,
+                _ => match input_text.parse::<usize>() {
+                    Ok(v) => break v,
+                    Err(_) => {
                         println!("\rNot a valid number, try again.");
                         continue;
                     }
                 },
-            };
+            }
         };
 
         let elapsed = start_time.elapsed();