diff options
Diffstat (limited to 'crates/shirabe-external-packages')
25 files changed, 170 insertions, 171 deletions
diff --git a/crates/shirabe-external-packages/src/composer/metadata_minifier/metadata_minifier.rs b/crates/shirabe-external-packages/src/composer/metadata_minifier/metadata_minifier.rs index 0d1ae86..3f1a4fc 100644 --- a/crates/shirabe-external-packages/src/composer/metadata_minifier/metadata_minifier.rs +++ b/crates/shirabe-external-packages/src/composer/metadata_minifier/metadata_minifier.rs @@ -11,7 +11,7 @@ impl MetadataMinifier { let mut expanded: Vec<IndexMap<String, PhpMixed>> = Vec::new(); let mut expanded_version: Option<IndexMap<String, PhpMixed>> = None; for version_data in versions { - if expanded_version.as_ref().map_or(true, |ev| ev.is_empty()) { + if expanded_version.as_ref().is_none_or(|ev| ev.is_empty()) { expanded.push(version_data.clone()); expanded_version = Some(version_data); continue; diff --git a/crates/shirabe-external-packages/src/composer/pcre/preg.rs b/crates/shirabe-external-packages/src/composer/pcre/preg.rs index 72800dd..1ff7dc6 100644 --- a/crates/shirabe-external-packages/src/composer/pcre/preg.rs +++ b/crates/shirabe-external-packages/src/composer/pcre/preg.rs @@ -88,7 +88,7 @@ impl Preg { *out = null_to_empty_match_all(internal); } - result as usize + result } pub fn match_all_with_offsets5( @@ -113,7 +113,7 @@ impl Preg { *out = null_to_empty_offset_match_all(internal); } - result as usize + result } pub fn replace(pattern: &str, replacement: &str, subject: &str) -> String { diff --git a/crates/shirabe-external-packages/src/symfony/console/attribute/as_command.rs b/crates/shirabe-external-packages/src/symfony/console/attribute/as_command.rs index f5852a7..233e0b7 100644 --- a/crates/shirabe-external-packages/src/symfony/console/attribute/as_command.rs +++ b/crates/shirabe-external-packages/src/symfony/console/attribute/as_command.rs @@ -25,7 +25,7 @@ impl AsCommand { let mut name: Vec<String> = this.name.split('|').map(|s| s.to_string()).collect(); name.extend(aliases); - if hidden && "" != name[0] { + if hidden && !name[0].is_empty() { name.insert(0, String::new()); } diff --git a/crates/shirabe-external-packages/src/symfony/console/completion/completion_input.rs b/crates/shirabe-external-packages/src/symfony/console/completion/completion_input.rs index c59010a..482e7e1 100644 --- a/crates/shirabe-external-packages/src/symfony/console/completion/completion_input.rs +++ b/crates/shirabe-external-packages/src/symfony/console/completion/completion_input.rs @@ -76,36 +76,37 @@ impl CompletionInput { return Ok(()); } - if let Some(option) = &option { - if option.accept_value() { - self.completion_type = Self::TYPE_OPTION_VALUE.to_string(); - self.completion_name = Some(option.get_name().to_string()); - self.completion_value = if !option_value.is_empty() { - option_value - } else if !shirabe_php_shim::str_starts_with(&option_token, "--") { - shirabe_php_shim::substr(&option_token, 2, None) - } else { - String::new() - }; + if let Some(option) = &option + && option.accept_value() + { + self.completion_type = Self::TYPE_OPTION_VALUE.to_string(); + self.completion_name = Some(option.get_name().to_string()); + self.completion_value = if !option_value.is_empty() { + option_value + } else if !shirabe_php_shim::str_starts_with(&option_token, "--") { + shirabe_php_shim::substr(&option_token, 2, None) + } else { + String::new() + }; - return Ok(()); - } + return Ok(()); } } let previous_token = self.tokens[(self.current_index - 1) as usize].clone(); - if "-" == &previous_token[0..1] && "" != shirabe_php_shim::trim(&previous_token, Some("-")) + if "-" == &previous_token[0..1] + && !shirabe_php_shim::trim(&previous_token, Some("-")).is_empty() { // check if previous option accepted a value let previous_option = self.get_option_from_token(&previous_token); - if let Some(previous_option) = &previous_option { - if previous_option.accept_value() { - self.completion_type = Self::TYPE_OPTION_VALUE.to_string(); - self.completion_name = Some(previous_option.get_name().to_string()); - self.completion_value = relevant_token; + if let Some(previous_option) = &previous_option + && previous_option.accept_value() + { + self.completion_type = Self::TYPE_OPTION_VALUE.to_string(); + self.completion_name = Some(previous_option.get_name().to_string()); + self.completion_value = relevant_token; - return Ok(()); - } + return Ok(()); } } diff --git a/crates/shirabe-external-packages/src/symfony/console/completion/completion_suggestions.rs b/crates/shirabe-external-packages/src/symfony/console/completion/completion_suggestions.rs index 14d6941..2fb617a 100644 --- a/crates/shirabe-external-packages/src/symfony/console/completion/completion_suggestions.rs +++ b/crates/shirabe-external-packages/src/symfony/console/completion/completion_suggestions.rs @@ -17,6 +17,12 @@ pub struct CompletionSuggestions { option_suggestions: Vec<InputOption>, } +impl Default for CompletionSuggestions { + fn default() -> Self { + Self::new() + } +} + impl CompletionSuggestions { pub fn new() -> Self { Self { diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/application_description.rs b/crates/shirabe-external-packages/src/symfony/console/descriptor/application_description.rs index 0ee4b48..d30e6ad 100644 --- a/crates/shirabe-external-packages/src/symfony/console/descriptor/application_description.rs +++ b/crates/shirabe-external-packages/src/symfony/console/descriptor/application_description.rs @@ -163,7 +163,7 @@ impl ApplicationDescription { } else { namespaced_commands .entry(key) - .or_insert_with(IndexMap::new) + .or_default() .insert(name, command); } } diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs b/crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs index f89d48e..4793370 100644 --- a/crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs +++ b/crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs @@ -352,7 +352,7 @@ impl JsonDescriptor { data.insert( "definition".to_string(), PhpMixed::Array( - self.get_input_definition_data(&command.get_definition())? + self.get_input_definition_data(command.get_definition())? .into_iter() .map(|(k, v)| (k, Box::new(v))) .collect(), diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs b/crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs index 93928e7..698cc51 100644 --- a/crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs +++ b/crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs @@ -118,7 +118,7 @@ impl MarkdownDescriptor { definition: &InputDefinition, _options: IndexMap<String, PhpMixed>, ) -> anyhow::Result<()> { - let show_arguments = definition.get_arguments().len() > 0; + let show_arguments = !definition.get_arguments().is_empty(); if show_arguments { self.write("### Arguments", true); for argument in definition.get_arguments().values() { @@ -128,7 +128,7 @@ impl MarkdownDescriptor { } } - if definition.get_options().len() > 0 { + if !definition.get_options().is_empty() { if show_arguments { self.write("\n\n", true); } diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs b/crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs index d330447..915e19e 100644 --- a/crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs +++ b/crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs @@ -340,10 +340,10 @@ impl TextDescriptor { for namespace in namespaces.values() { if let Some(PhpMixed::List(ns_commands)) = namespace.get("commands") { for c in ns_commands { - if let PhpMixed::String(name) = c.as_ref() { - if command_keys.contains(name) { - merged.push(CommandOrString::String(name.clone())); - } + if let PhpMixed::String(name) = c.as_ref() + && command_keys.contains(name) + { + merged.push(CommandOrString::String(name.clone())); } } } @@ -466,7 +466,7 @@ impl TextDescriptor { let mut arr = arr.clone(); for (_key, value) in arr.iter_mut() { if let PhpMixed::String(s) = value.as_ref() { - *value = Box::new(PhpMixed::String(OutputFormatter::escape(s)?)); + **value = PhpMixed::String(OutputFormatter::escape(s)?); } } PhpMixed::Array(arr) @@ -475,7 +475,7 @@ impl TextDescriptor { let mut list = list.clone(); for value in list.iter_mut() { if let PhpMixed::String(s) = value.as_ref() { - *value = Box::new(PhpMixed::String(OutputFormatter::escape(s)?)); + **value = PhpMixed::String(OutputFormatter::escape(s)?); } } PhpMixed::List(list) diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style.rs b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style.rs index 14626ca..39d694d 100644 --- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style.rs +++ b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_style.rs @@ -87,10 +87,10 @@ impl OutputFormatterStyleInterface for OutputFormatterStyle { ); } - if let Some(href) = &self.href { - if self.handles_href_gracefully == Some(true) { - text = format!("\x1b]8;;{href}\x1b\\{text}\x1b]8;;\x1b\\"); - } + if let Some(href) = &self.href + && self.handles_href_gracefully == Some(true) + { + text = format!("\x1b]8;;{href}\x1b\\{text}\x1b]8;;\x1b\\"); } self.color.apply(&text) diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs index cc49f0a..de72b2e 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs @@ -93,15 +93,14 @@ impl Helper { ]; for (index, format) in time_formats.iter().enumerate() { - if secs >= format.0 { - if (index + 1 < time_formats.len() && secs < time_formats[index + 1].0) - || index == time_formats.len() - 1 - { - match format.2 { - None => return Some(format.1.to_string()), - Some(divisor) => { - return Some(format!("{} {}", (secs / divisor).floor(), format.1)); - } + if secs >= format.0 + && ((index + 1 < time_formats.len() && secs < time_formats[index + 1].0) + || index == time_formats.len() - 1) + { + match format.2 { + None => return Some(format.1.to_string()), + Some(divisor) => { + return Some(format!("{} {}", (secs / divisor).floor(), format.1)); } } } diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs b/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs index cf25a20..d9b808e 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs @@ -329,7 +329,7 @@ impl ProgressBar { iterable: Vec<(shirabe_php_shim::PhpMixed, shirabe_php_shim::PhpMixed)>, max: Option<i64>, ) -> anyhow::Result<Vec<(shirabe_php_shim::PhpMixed, shirabe_php_shim::PhpMixed)>> { - self.start(Some(max.unwrap_or_else(|| { + self.start(Some(max.unwrap_or({ // is_countable($iterable) ? \count($iterable) : 0 iterable.len() as i64 })))?; diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs index 634027c..3b91f3b 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs @@ -527,10 +527,10 @@ impl QuestionHelper { let mut temp_ret = ret.clone(); - if let Some(choice_question) = question_as_choice_question(question) { - if choice_question.is_multiselect() { - temp_ret = self.most_recently_entered_value(&full_choice); - } + if let Some(choice_question) = question_as_choice_question(question) + && choice_question.is_multiselect() + { + temp_ret = self.most_recently_entered_value(&full_choice); } num_matches = 0; diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs index 252b0f9..618398b 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs @@ -30,7 +30,7 @@ impl SymfonyQuestionHelper { output: Rc<RefCell<dyn OutputInterface>>, question: &Question, ) { - let mut text = OutputFormatter::escape_trailing_backslash(&question.get_question()); + let mut text = OutputFormatter::escape_trailing_backslash(question.get_question()); let default = question.get_default(); if question.is_multiline() { diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table_cell.rs b/crates/shirabe-external-packages/src/symfony/console/helper/table_cell.rs index 3f1b719..b737cbc 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/table_cell.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/table_cell.rs @@ -47,18 +47,17 @@ impl TableCell { )); } - if let Some(style) = options.get("style") { - if !matches!(style, TableCellOption::Style(_)) - && !matches!(style, TableCellOption::Null) - { - return Err(InvalidArgumentException( - shirabe_php_shim::InvalidArgumentException { - message: "The style option must be an instance of \"TableCellStyle\"." - .to_string(), - code: 0, - }, - )); - } + if let Some(style) = options.get("style") + && !matches!(style, TableCellOption::Style(_)) + && !matches!(style, TableCellOption::Null) + { + return Err(InvalidArgumentException( + shirabe_php_shim::InvalidArgumentException { + message: "The style option must be an instance of \"TableCellStyle\"." + .to_string(), + code: 0, + }, + )); } for (key, option) in options { 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), diff --git a/crates/shirabe-external-packages/src/symfony/console/output/console_output.rs b/crates/shirabe-external-packages/src/symfony/console/output/console_output.rs index 281ab11..8bd428d 100644 --- a/crates/shirabe-external-packages/src/symfony/console/output/console_output.rs +++ b/crates/shirabe-external-packages/src/symfony/console/output/console_output.rs @@ -81,13 +81,13 @@ impl ConsoleOutput { /// Returns true if current environment supports writing console output to /// STDOUT. fn has_stdout_support() -> bool { - false == Self::is_running_os400() + !Self::is_running_os400() } /// Returns true if current environment supports writing console output to /// STDERR. fn has_stderr_support() -> bool { - false == Self::is_running_os400() + !Self::is_running_os400() } /// Checks if current executing environment is IBM iSeries (OS400), which diff --git a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs b/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs index f5e48ca..323135c 100644 --- a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs +++ b/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs @@ -73,7 +73,7 @@ impl StreamOutput { /// https://github.com/composer/xdebug-handler pub(crate) fn has_color_support(stream: &shirabe_php_shim::PhpResource) -> bool { // Follow https://no-color.org/ - if "" != no_color_first_char() { + if !no_color_first_char().is_empty() { return false; } diff --git a/crates/shirabe-external-packages/src/symfony/console/question/question.rs b/crates/shirabe-external-packages/src/symfony/console/question/question.rs index 99c9d6e..78ae9b2 100644 --- a/crates/shirabe-external-packages/src/symfony/console/question/question.rs +++ b/crates/shirabe-external-packages/src/symfony/console/question/question.rs @@ -219,15 +219,15 @@ impl Question { &mut self, attempts: Option<i64>, ) -> Result<&mut Self, InvalidArgumentException> { - if let Some(attempts) = attempts { - if attempts < 1 { - return Err(InvalidArgumentException( - shirabe_php_shim::InvalidArgumentException { - message: "Maximum number of attempts must be a positive value.".to_string(), - code: 0, - }, - )); - } + if let Some(attempts) = attempts + && attempts < 1 + { + return Err(InvalidArgumentException( + shirabe_php_shim::InvalidArgumentException { + message: "Maximum number of attempts must be a positive value.".to_string(), + code: 0, + }, + )); } self.attempts = attempts; diff --git a/crates/shirabe-external-packages/src/symfony/console/terminal.rs b/crates/shirabe-external-packages/src/symfony/console/terminal.rs index 5733b0c..9ac1f9e 100644 --- a/crates/shirabe-external-packages/src/symfony/console/terminal.rs +++ b/crates/shirabe-external-packages/src/symfony/console/terminal.rs @@ -82,33 +82,33 @@ impl Terminal { if shirabe_php_shim::DIRECTORY_SEPARATOR == "\\" { let ansicon = shirabe_php_shim::getenv("ANSICON"); let mut matches: Vec<Option<String>> = Vec::new(); - if let Some(ansicon) = &ansicon { - if shirabe_php_shim::preg_match( + if let Some(ansicon) = &ansicon + && shirabe_php_shim::preg_match( "/^(\\d+)x(\\d+)(?: \\((\\d+)x(\\d+)\\))?$/", &shirabe_php_shim::trim(ansicon, None), &mut matches, - ) { - // extract [w, H] from "wxh (WxH)" - // or [w, h] from "wxh" - WIDTH.with(|w| { - w.set(Some(shirabe_php_shim::intval(&PhpMixed::String( - matches[1].clone().unwrap_or_default(), - )))) - }); - HEIGHT.with(|h| { - let value = if matches.get(4).map(|m| m.is_some()).unwrap_or(false) { - shirabe_php_shim::intval(&PhpMixed::String( - matches[4].clone().unwrap_or_default(), - )) - } else { - shirabe_php_shim::intval(&PhpMixed::String( - matches[2].clone().unwrap_or_default(), - )) - }; - h.set(Some(value)); - }); - return; - } + ) + { + // extract [w, H] from "wxh (WxH)" + // or [w, h] from "wxh" + WIDTH.with(|w| { + w.set(Some(shirabe_php_shim::intval(&PhpMixed::String( + matches[1].clone().unwrap_or_default(), + )))) + }); + HEIGHT.with(|h| { + let value = if matches.get(4).map(|m| m.is_some()).unwrap_or(false) { + shirabe_php_shim::intval(&PhpMixed::String( + matches[4].clone().unwrap_or_default(), + )) + } else { + shirabe_php_shim::intval(&PhpMixed::String( + matches[2].clone().unwrap_or_default(), + )) + }; + h.set(Some(value)); + }); + return; } if !Self::has_vt100_support() && Self::has_stty_available() { |