diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-14 14:13:00 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-14 14:13:00 +0900 |
| commit | 430f59c1938b9e5da381365172ab788b54895ffc (patch) | |
| tree | 180ade07dadc7793a45839f42b5674d62bc5fc00 /crates/shirabe-external-packages/src/symfony/console/helper | |
| parent | ba0a7f913b4b2a83d0c8862d657bdc867730a962 (diff) | |
| download | php-shirabe-430f59c1938b9e5da381365172ab788b54895ffc.tar.gz php-shirabe-430f59c1938b9e5da381365172ab788b54895ffc.tar.zst php-shirabe-430f59c1938b9e5da381365172ab788b54895ffc.zip | |
refactor: auto-fix clippy warnings
Diffstat (limited to 'crates/shirabe-external-packages/src/symfony/console/helper')
5 files changed, 25 insertions, 27 deletions
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 { |
