From c84c38544bc6e81f0b0482e4e82b6c95848c1a0c Mon Sep 17 00:00:00 2001
From: Akshay <nerdy@peppe.rs>
Date: Tue, 6 Apr 2021 14:54:54 +0530
Subject: apply clippy lints

---
 src/cli.rs | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'src/cli.rs')

diff --git a/src/cli.rs b/src/cli.rs
index 1dbd098..6357355 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -4,7 +4,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-pub static HELP_TEXT: &'static str = "
+pub static HELP_TEXT: &str = "
 Usage
 -----
 
@@ -83,11 +83,11 @@ pub fn parse_args() -> Result<Config, CliError> {
                 if !Path::new(s).is_file() {
                     return Err(CliError::FileDoesNotExist);
                 }
-                return Ok(Config::ExistingProject {
+                Ok(Config::ExistingProject {
                     file_name: PathBuf::from(s),
-                });
+                })
             }
-            None => return Ok(Config::Help),
+            None => Ok(Config::Help),
         },
         _ => Err(CliError::SubCommandParseError),
     }
@@ -104,25 +104,23 @@ fn new_project(args: &mut pico_args::Arguments) -> Result<Config, CliError> {
         .opt_value_from_fn(["-d", "--dimensions"], parse_dimensions)
         .map_err(|_| CliError::DimensionParseError)?
         .unwrap_or((200, 200));
-    return Ok(Config::NewProject {
+    Ok(Config::NewProject {
         file_name: file_name.ok(),
         dimensions,
-    });
+    })
 }
 
 fn parse_dimensions(input: &str) -> Result<(u32, u32), CliError> {
     let dimensions: Vec<&str> = input.split('x').collect();
     match &dimensions[..] {
-        [width, height] => {
-            return Ok((
-                width
-                    .parse::<u32>()
-                    .map_err(|_| CliError::DimensionParseError)?,
-                height
-                    .parse::<u32>()
-                    .map_err(|_| CliError::DimensionParseError)?,
-            ))
-        }
-        _ => return Err(CliError::DimensionParseError),
+        [width, height] => Ok((
+            width
+                .parse::<u32>()
+                .map_err(|_| CliError::DimensionParseError)?,
+            height
+                .parse::<u32>()
+                .map_err(|_| CliError::DimensionParseError)?,
+        )),
+        _ => Err(CliError::DimensionParseError),
     }
 }
-- 
cgit v1.2.3