aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-external-packages/src
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-20 01:16:50 +0900
committernsfisis <nsfisis@gmail.com>2026-06-20 02:22:41 +0900
commitefec43b3b8827820cf35fe1b73d8e33f5fe84eb4 (patch)
treea62bbba72324de48be5f8e689559f8d9e288fc61 /crates/shirabe-external-packages/src
parentcac18ef73a39b4ac41fa4d6ccb753804d4c42cb7 (diff)
downloadphp-shirabe-efec43b3b8827820cf35fe1b73d8e33f5fe84eb4.tar.gz
php-shirabe-efec43b3b8827820cf35fe1b73d8e33f5fe84eb4.tar.zst
php-shirabe-efec43b3b8827820cf35fe1b73d8e33f5fe84eb4.zip
refactor: auto-fix clippy warnings
Diffstat (limited to 'crates/shirabe-external-packages/src')
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/command/command.rs36
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs2
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/command/dump_completion_command.rs6
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/command/help_command.rs6
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/command/list_command.rs6
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs6
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs10
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/helper/table_cell.rs5
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs2
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs10
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs10
11 files changed, 58 insertions, 41 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/command.rs b/crates/shirabe-external-packages/src/symfony/console/command/command.rs
index 2040f95..e737b58 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/command.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/command/command.rs
@@ -178,16 +178,13 @@ impl CommandData {
description.to_string(),
default.clone(),
)?)?;
- if self.full_definition.is_some() {
- self.full_definition
- .as_mut()
- .unwrap()
- .add_argument(InputArgument::new(
- name.to_string(),
- mode,
- description.to_string(),
- default,
- )?)?;
+ if let Some(full_definition) = self.full_definition.as_mut() {
+ full_definition.add_argument(InputArgument::new(
+ name.to_string(),
+ mode,
+ description.to_string(),
+ default,
+ )?)?;
}
Ok(self)
@@ -214,17 +211,14 @@ impl CommandData {
description.to_string(),
default.clone(),
)?)?;
- if self.full_definition.is_some() {
- self.full_definition
- .as_mut()
- .unwrap()
- .add_option(InputOption::new(
- name,
- shortcut,
- mode,
- description.to_string(),
- default,
- )?)?;
+ if let Some(full_definition) = self.full_definition.as_mut() {
+ full_definition.add_option(InputOption::new(
+ name,
+ shortcut,
+ mode,
+ description.to_string(),
+ default,
+ )?)?;
}
Ok(self)
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs b/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs
index 522bb78..80186a3 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs
@@ -373,7 +373,7 @@ impl Command for CompleteCommand {
}
}
- completion_output.write(&suggestions, &mut *output.borrow_mut());
+ completion_output.write(&suggestions, &*output.borrow_mut());
Ok(0)
})();
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/dump_completion_command.rs b/crates/shirabe-external-packages/src/symfony/console/command/dump_completion_command.rs
index c8947b8..cb76ff8 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/dump_completion_command.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/command/dump_completion_command.rs
@@ -34,6 +34,12 @@ impl DerefMut for DumpCompletionCommand {
}
}
+impl Default for DumpCompletionCommand {
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
impl DumpCompletionCommand {
pub const DEFAULT_NAME: &'static str = "completion";
pub const DEFAULT_DESCRIPTION: &'static str = "Dump the shell completion script";
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/help_command.rs b/crates/shirabe-external-packages/src/symfony/console/command/help_command.rs
index d98152f..2346258 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/help_command.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/command/help_command.rs
@@ -39,6 +39,12 @@ impl DerefMut for HelpCommand {
}
}
+impl Default for HelpCommand {
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
impl HelpCommand {
pub fn new() -> Self {
let mut command = HelpCommand {
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/list_command.rs b/crates/shirabe-external-packages/src/symfony/console/command/list_command.rs
index bfaece7..1d467ae 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/list_command.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/command/list_command.rs
@@ -38,6 +38,12 @@ impl DerefMut for ListCommand {
}
}
+impl Default for ListCommand {
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
impl ListCommand {
pub fn new() -> Self {
let mut command = ListCommand {
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs
index 1fad8f8..a32c95d 100644
--- a/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs
@@ -149,11 +149,13 @@ impl ProcessHelper {
.write(&[stopped], false, output_interface::OUTPUT_NORMAL);
}
- if !process.is_successful() && error.is_some() {
+ if !process.is_successful()
+ && let Some(error) = error
+ {
output.borrow().writeln(
&[format!(
"<error>{}</error>",
- shirabe_php_shim::PhpMixed::String(self.escape_string(error.unwrap()),),
+ shirabe_php_shim::PhpMixed::String(self.escape_string(error),),
)],
output_interface::OUTPUT_NORMAL,
);
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 3b91f3b..1c01d70 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
@@ -465,7 +465,7 @@ impl QuestionHelper {
None,
);
output.borrow().write(
- &[remaining_characters.clone()],
+ std::slice::from_ref(&remaining_characters),
false,
output_interface::OUTPUT_NORMAL,
);
@@ -518,9 +518,11 @@ impl QuestionHelper {
}
let cur = c.clone().unwrap_or_default();
- output
- .borrow()
- .write(&[cur.clone()], false, output_interface::OUTPUT_NORMAL);
+ output.borrow().write(
+ std::slice::from_ref(&cur),
+ false,
+ output_interface::OUTPUT_NORMAL,
+ );
ret.push_str(&cur);
full_choice.push_str(&cur);
i += 1;
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 b737cbc..a967d0e 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
@@ -78,11 +78,6 @@ impl TableCell {
Self::new(value, options).expect("TableCell options built internally are always valid")
}
- /// Returns the cell value.
- pub fn to_string(&self) -> String {
- self.value.clone()
- }
-
/// Gets number of colspan.
pub fn get_colspan(&self) -> i64 {
match self.options["colspan"] {
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 80105e9..c614f88 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
@@ -240,7 +240,7 @@ impl ArgvInput {
if let Some(key) = &first_key {
let input_argument = &all[key];
if input_argument.get_name() == "command" {
- symfony_command_name = self.inner.arguments.get("command").map(|v| v.clone());
+ symfony_command_name = self.inner.arguments.get("command").cloned();
all.shift_remove(key);
}
}
diff --git a/crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs b/crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs
index 9de2d05..e1368e5 100644
--- a/crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/question/choice_question.rs
@@ -120,7 +120,10 @@ impl ChoiceQuestion {
) {
return Err(InvalidArgumentException(
shirabe_php_shim::InvalidArgumentException {
- message: shirabe_php_shim::sprintf(&error_message, &[selected.clone()]),
+ message: shirabe_php_shim::sprintf(
+ &error_message,
+ std::slice::from_ref(&selected),
+ ),
code: 0,
},
));
@@ -198,7 +201,10 @@ impl ChoiceQuestion {
if matches!(result, PhpMixed::Bool(false)) {
return Err(InvalidArgumentException(
shirabe_php_shim::InvalidArgumentException {
- message: shirabe_php_shim::sprintf(&error_message, &[value.clone()]),
+ message: shirabe_php_shim::sprintf(
+ &error_message,
+ std::slice::from_ref(value),
+ ),
code: 0,
},
));
diff --git a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs b/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs
index 3f0406a..3a04885 100644
--- a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs
@@ -477,7 +477,7 @@ impl SymfonyStyle {
for message in messages {
let message = Self::php_string(&message);
- self.inner.writeln(&[message.clone()], r#type);
+ self.inner.writeln(std::slice::from_ref(&message), r#type);
self.write_buffer(&message, true, r#type);
}
}
@@ -493,7 +493,8 @@ impl SymfonyStyle {
for message in messages {
let message = Self::php_string(&message);
- self.inner.write(&[message.clone()], newline, r#type);
+ self.inner
+ .write(std::slice::from_ref(&message), newline, r#type);
self.write_buffer(&message, newline, r#type);
}
}
@@ -696,8 +697,7 @@ impl StyleInterface for SymfonyStyle {
choices: Vec<PhpMixed>,
default: Option<PhpMixed>,
) -> PhpMixed {
- let default = if default.is_some() {
- let default = default.unwrap();
+ let default = if let Some(default) = default {
let values = shirabe_php_shim::array_flip(&PhpMixed::List(
choices.iter().cloned().map(Box::new).collect(),
));
@@ -705,7 +705,7 @@ impl StyleInterface for SymfonyStyle {
let _ = values;
Some(default)
} else {
- default
+ None
};
// PHP: return $this->askQuestion(new ChoiceQuestion($question, $choices, $default));