From 432472808051cb4f1bb9517b858dbc810aaa5a63 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 25 Jul 2026 16:16:33 +0900 Subject: refactor: replace redundant clones with moves Co-Authored-By: Claude Opus 5 --- crates/shirabe-external-packages/src/symfony/console/color.rs | 2 +- .../shirabe-external-packages/src/symfony/console/command/command.rs | 2 +- .../src/symfony/console/descriptor/text_descriptor.rs | 2 +- .../src/symfony/console/formatter/output_formatter_style.rs | 2 +- .../src/symfony/console/helper/question_helper.rs | 2 +- .../src/symfony/console/helper/symfony_question_helper.rs | 2 +- .../src/symfony/console/input/argv_input.rs | 4 ++-- .../src/symfony/console/input/input_definition.rs | 5 +---- .../src/symfony/console/question/choice_question.rs | 4 ++-- 9 files changed, 11 insertions(+), 14 deletions(-) (limited to 'crates/shirabe-external-packages/src/symfony/console') diff --git a/crates/shirabe-external-packages/src/symfony/console/color.rs b/crates/shirabe-external-packages/src/symfony/console/color.rs index fb7cc9f0..79d0c58b 100644 --- a/crates/shirabe-external-packages/src/symfony/console/color.rs +++ b/crates/shirabe-external-packages/src/symfony/console/color.rs @@ -155,7 +155,7 @@ impl Color { if shirabe_php_shim::strlen(&color) != 6 { return Err(InvalidArgumentException( shirabe_php_shim::InvalidArgumentException { - message: format!("Invalid \"{}\" color.", color.clone()), + message: format!("Invalid \"{}\" color.", color), code: 0, }, )); 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 ef4a471a..6e6c2212 100644 --- a/crates/shirabe-external-packages/src/symfony/console/command/command.rs +++ b/crates/shirabe-external-packages/src/symfony/console/command/command.rs @@ -747,7 +747,7 @@ impl Command for CommandData { let replacements = [ name.clone().unwrap_or_default(), if is_single_command { - php_self.clone() + php_self } else { format!("{} {}", php_self, name.unwrap_or_default()) }, 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 8e54d9ea..2aaa3ebc 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 @@ -121,7 +121,7 @@ impl TextDescriptor { if option.is_negatable() { format!("--{0}|--no-{0}", option.get_name().to_string()) } else { - format!("--{0}{1}", option.get_name(), value.clone()) + format!("--{0}{1}", option.get_name(), value) } ); 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 c421edf5..dac390fe 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 @@ -25,7 +25,7 @@ impl OutputFormatterStyle { .filter(|s| !s.is_empty()) .unwrap_or("") .to_string(); - let color = Color::new(&foreground, &background, &options.clone()).unwrap(); + let color = Color::new(&foreground, &background, &options).unwrap(); Self { color, foreground, 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 3f95f4da..f6ef31da 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 @@ -483,7 +483,7 @@ impl QuestionHelper { if c.as_deref() == Some("\n") { output.borrow().write( - &[c.clone().unwrap_or_default()], + &[c.unwrap_or_default()], false, output_interface::OUTPUT_NORMAL, ); 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 786141e9..086f9c1c 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 @@ -73,7 +73,7 @@ impl SymfonyQuestionHelper { &choices .get(&default.to_string()) .cloned() - .unwrap_or(default.clone()) + .unwrap_or(default) .to_string(), ) .unwrap(), 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 7c24da60..bf1ea659 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 @@ -148,7 +148,7 @@ impl ArgvInput { if !self.inner.definition.has_shortcut(&name_i) { let encoding = shirabe_php_shim::mb_detect_encoding(name, None, true); let bad = match encoding { - None => name_i.clone(), + None => name_i, Some(encoding) => { shirabe_php_shim::mb_substr(name, i, Some(1), Some(&encoding)) } @@ -269,7 +269,7 @@ impl ArgvInput { { format!( "No arguments expected for \"{}\" command, got \"{}\".", - symfony_command_name.clone().unwrap(), + symfony_command_name.unwrap(), token, ) } else { 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 2c06b05f..eabb7003 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 @@ -304,10 +304,7 @@ impl InputDefinition { let negated_name = format!("no-{}", option.get_name()); if self.options.contains_key(&negated_name) { return Err(LogicException(shirabe_php_shim::LogicException { - message: format!( - "An option named \"{}\" already exists.", - negated_name.clone(), - ), + message: format!("An option named \"{}\" already exists.", negated_name), code: 0, }) .into()); 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 848888a6..9deec851 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 @@ -45,7 +45,7 @@ impl ChoiceQuestion { this.inner.set_validator(Some(validator)); // setAutocompleterValues never throws for an array argument. this.inner - .set_autocompleter_values(Some(PhpMixed::Array(choices.clone()))) + .set_autocompleter_values(Some(PhpMixed::Array(choices))) .expect("autocompleter cannot be set on a hidden question during construction"); Ok(this) @@ -145,7 +145,7 @@ impl ChoiceQuestion { .map(PhpMixed::String) .collect() } else { - vec![selected.clone()] + vec![selected] }; let mut selected_choices = selected_choices; -- cgit v1.3.1