refactor: auto-fix clippy warnings

6 files changed, 63 insertions, 69 deletions

diff --git a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs
index 185d3f9..a292a52 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs
@@ -92,7 +92,7 @@ impl ArgvInput {
     }
 
     pub(crate) fn parse_token(&mut self, token: &str, parse_options: bool) -> anyhow::Result<bool> {
-        if parse_options && token == "" {
+        if parse_options && token.is_empty() {
             self.parse_argument(token)?;
         } else if parse_options && token == "--" {
             return Ok(false);
@@ -163,11 +163,11 @@ impl ArgvInput {
                 } else {
                     PhpMixed::String(shirabe_php_shim::substr(name, i + 1, None))
                 };
-                self.add_long_option(&option.get_name().to_string(), value)?;
+                self.add_long_option(option.get_name(), value)?;
 
                 break;
             } else {
-                self.add_long_option(&option.get_name().to_string(), PhpMixed::Null)?;
+                self.add_long_option(option.get_name(), PhpMixed::Null)?;
             }
             i += 1;
         }
@@ -183,7 +183,7 @@ impl ArgvInput {
             Some(pos) => {
                 let pos = pos as i64;
                 let value = shirabe_php_shim::substr(&name, pos + 1, None);
-                if value == "" {
+                if value.is_empty() {
                     self.parsed.insert(0, value.clone());
                 }
                 self.add_long_option(
@@ -236,15 +236,12 @@ impl ArgvInput {
             if let Some(key) = &first_key {
                 let input_argument = &all[key];
                 if input_argument.get_name() == "command" {
-                    symfony_command_name = match self.inner.arguments.get("command") {
-                        Some(v) => Some(v.clone()),
-                        None => None,
-                    };
+                    symfony_command_name = self.inner.arguments.get("command").map(|v| v.clone());
                     all.shift_remove(key);
                 }
             }
 
-            let message = if all.len() > 0 {
+            let message = if !all.is_empty() {
                 let names: Vec<String> = all.keys().cloned().collect();
                 match &symfony_command_name {
                     Some(symfony_command_name)
@@ -300,12 +297,10 @@ impl ArgvInput {
         }
 
         self.add_long_option(
-            &self
-                .inner
+            self.inner
                 .definition
                 .get_option_for_shortcut(shortcut)?
-                .get_name()
-                .to_string(),
+                .get_name(),
             value,
         )
     }
@@ -426,15 +421,15 @@ impl ArgvInput {
                 {
                     // noop
                 } else {
-                    if !self.inner.options.contains_key(&name) {
-                        if let Ok(resolved) = self.inner.definition.shortcut_to_name(&name) {
-                            name = resolved;
-                        }
+                    if !self.inner.options.contains_key(&name)
+                        && let Ok(resolved) = self.inner.definition.shortcut_to_name(&name)
+                    {
+                        name = resolved;
                     }
-                    if let Some(option_value) = self.inner.options.get(&name) {
-                        if self.tokens.get(i + 1).map(|t| t.as_str()) == option_value.as_string() {
-                            is_option = true;
-                        }
+                    if let Some(option_value) = self.inner.options.get(&name)
+                        && self.tokens.get(i + 1).map(|t| t.as_str()) == option_value.as_string()
+                    {
+                        is_option = true;
                     }
                 }
 
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs
index 1d52758..6f3f596 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs
@@ -57,10 +57,11 @@ impl ArrayInput {
     pub fn get_first_argument(&self) -> Option<PhpMixed> {
         for (param, value) in &self.parameters {
             // $param && \is_string($param) && '-' === $param[0]
-            if let PhpMixed::String(param) = param {
-                if !param.is_empty() && param.as_bytes()[0] == b'-' {
-                    continue;
-                }
+            if let PhpMixed::String(param) = param
+                && !param.is_empty()
+                && param.as_bytes()[0] == b'-'
+            {
+                continue;
             }
 
             return Some(value.clone());
@@ -147,7 +148,7 @@ impl ArrayInput {
                         params.push(format!(
                             "{}{}",
                             param,
-                            if v != "" {
+                            if !v.is_empty() {
                                 format!("{}{}", glue, self.inner.escape_token(&v))
                             } else {
                                 String::new()
@@ -159,7 +160,7 @@ impl ArrayInput {
                     params.push(format!(
                         "{}{}",
                         param,
-                        if val != "" {
+                        if !val.is_empty() {
                             format!("{}{}", glue, self.inner.escape_token(&val))
                         } else {
                             String::new()
@@ -219,12 +220,10 @@ impl ArrayInput {
         }
 
         self.add_long_option(
-            &self
-                .inner
+            self.inner
                 .definition
                 .get_option_for_shortcut(shortcut)?
-                .get_name()
-                .to_string(),
+                .get_name(),
             value,
         )
     }
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input.rs b/crates/shirabe-external-packages/src/symfony/console/input/input.rs
index 5e6d9d0..d13ab6c 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/input.rs
@@ -79,7 +79,7 @@ impl Input {
             },
         );
 
-        if missing_arguments.len() > 0 {
+        if !missing_arguments.is_empty() {
             return Err(RuntimeException(shirabe_php_shim::RuntimeException {
                 message: format!(
                     "Not enough arguments (missing: \"{}\").",
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_argument.rs b/crates/shirabe-external-packages/src/symfony/console/input/input_argument.rs
index 7a34429..bc825d5 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_argument.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/input_argument.rs
@@ -25,7 +25,7 @@ impl InputArgument {
     ) -> anyhow::Result<Self> {
         let mode = match mode {
             None => Self::OPTIONAL,
-            Some(m) if m > 7 || m < 1 => {
+            Some(m) if !(1..=7).contains(&m) => {
                 return Err(
                     InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
                         message: format!("Argument mode \"{}\" is not valid.", m),
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs b/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs
index 47ce786..390f416 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs
@@ -113,18 +113,18 @@ impl InputDefinition {
             .into());
         }
 
-        if argument.is_required() {
-            if let Some(last_optional_argument) = &self.last_optional_argument {
-                return Err(LogicException(shirabe_php_shim::LogicException {
-                    message: format!(
-                        "Cannot add a required argument \"{}\" after an optional one \"{}\".",
-                        PhpMixed::String(argument.get_name().to_string()),
-                        PhpMixed::String(last_optional_argument.get_name().to_string()),
-                    ),
-                    code: 0,
-                })
-                .into());
-            }
+        if argument.is_required()
+            && let Some(last_optional_argument) = &self.last_optional_argument
+        {
+            return Err(LogicException(shirabe_php_shim::LogicException {
+                message: format!(
+                    "Cannot add a required argument \"{}\" after an optional one \"{}\".",
+                    PhpMixed::String(argument.get_name().to_string()),
+                    PhpMixed::String(last_optional_argument.get_name().to_string()),
+                ),
+                code: 0,
+            })
+            .into());
         }
 
         if argument.is_array() {
@@ -232,17 +232,17 @@ impl InputDefinition {
     pub fn add_option(&mut self, option: InputOption) -> anyhow::Result<()> {
         let option = Rc::new(option);
 
-        if let Some(existing) = self.options.get(option.get_name()) {
-            if !option.equals(existing) {
-                return Err(LogicException(shirabe_php_shim::LogicException {
-                    message: format!(
-                        "An option named \"{}\" already exists.",
-                        PhpMixed::String(option.get_name().to_string()),
-                    ),
-                    code: 0,
-                })
-                .into());
-            }
+        if let Some(existing) = self.options.get(option.get_name())
+            && !option.equals(existing)
+        {
+            return Err(LogicException(shirabe_php_shim::LogicException {
+                message: format!(
+                    "An option named \"{}\" already exists.",
+                    PhpMixed::String(option.get_name().to_string()),
+                ),
+                code: 0,
+            })
+            .into());
         }
         if self.negations.contains_key(option.get_name()) {
             return Err(LogicException(shirabe_php_shim::LogicException {
@@ -257,17 +257,17 @@ impl InputDefinition {
 
         if let Some(shortcut) = option.get_shortcut() {
             for shortcut in shirabe_php_shim::explode("|", shortcut) {
-                if let Some(existing_name) = self.shortcuts.get(&shortcut) {
-                    if !option.equals(&self.options[existing_name]) {
-                        return Err(LogicException(shirabe_php_shim::LogicException {
-                            message: format!(
-                                "An option with shortcut \"{}\" already exists.",
-                                PhpMixed::String(shortcut.clone()),
-                            ),
-                            code: 0,
-                        })
-                        .into());
-                    }
+                if let Some(existing_name) = self.shortcuts.get(&shortcut)
+                    && !option.equals(&self.options[existing_name])
+                {
+                    return Err(LogicException(shirabe_php_shim::LogicException {
+                        message: format!(
+                            "An option with shortcut \"{}\" already exists.",
+                            PhpMixed::String(shortcut.clone()),
+                        ),
+                        code: 0,
+                    })
+                    .into());
                 }
             }
         }
@@ -436,7 +436,7 @@ impl InputDefinition {
             }
         }
 
-        if elements.len() > 0 && !self.get_arguments().is_empty() {
+        if !elements.is_empty() && !self.get_arguments().is_empty() {
             elements.push("[--]".to_string());
         }
 
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs b/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs
index 5ef265e..4b3feb8 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs
@@ -68,7 +68,7 @@ impl InputOption {
 
         let mode = match mode {
             None => Self::VALUE_NONE,
-            Some(m) if m >= (Self::VALUE_NEGATABLE << 1) || m < 1 => {
+            Some(m) if !(1..(Self::VALUE_NEGATABLE << 1)).contains(&m) => {
                 return Err(
                     InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
                         message: format!("Option mode \"{}\" is not valid.", m),