From d5b313f388d424e60ae33ae58c1a65a65b24b8f1 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 6 Jun 2026 18:04:45 +0900 Subject: refactor(command): share Input/OutputInterface via Rc Convert InputInterface and OutputInterface parameters from &dyn/&mut dyn references to Rc> shared ownership across the command, console, and IO layers, matching the Phase C shared-ownership approach already used for IOInterface. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/command/validate_command.rs | 36 +++++++++++++++++++++----- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'crates/shirabe/src/command/validate_command.rs') diff --git a/crates/shirabe/src/command/validate_command.rs b/crates/shirabe/src/command/validate_command.rs index b168b03..eaae2db 100644 --- a/crates/shirabe/src/command/validate_command.rs +++ b/crates/shirabe/src/command/validate_command.rs @@ -110,10 +110,11 @@ impl ValidateCommand { pub fn execute( &mut self, - input: &dyn InputInterface, - output: &dyn OutputInterface, + input: std::rc::Rc>, + output: std::rc::Rc>, ) -> Result { let file = input + .borrow() .get_argument("file") .as_string() .map(|s| s.to_string()) @@ -131,17 +132,28 @@ impl ValidateCommand { } let validator = ConfigValidator::new(io.clone()); - let check_all = if input.get_option("no-check-all").as_bool().unwrap_or(false) { + let check_all = if input + .borrow() + .get_option("no-check-all") + .as_bool() + .unwrap_or(false) + { 0 } else { ValidatingArrayLoader::CHECK_ALL }; let check_publish = !input + .borrow() .get_option("no-check-publish") .as_bool() .unwrap_or(false); - let check_lock = !input.get_option("no-check-lock").as_bool().unwrap_or(false); + let check_lock = !input + .borrow() + .get_option("no-check-lock") + .as_bool() + .unwrap_or(false); let check_version = if input + .borrow() .get_option("no-check-version") .as_bool() .unwrap_or(false) @@ -150,12 +162,17 @@ impl ValidateCommand { } else { ConfigValidator::CHECK_VERSION }; - let is_strict = input.get_option("strict").as_bool().unwrap_or(false); + let is_strict = input + .borrow() + .get_option("strict") + .as_bool() + .unwrap_or(false); let (mut errors, mut publish_errors, mut warnings) = validator.validate(&file, check_all, check_version); let mut lock_errors: Vec = vec![]; - let composer = self.create_composer_instance(input, io.clone(), None, false, None)?; + let composer = + self.create_composer_instance(input.clone(), io.clone(), None, false, None)?; let mut composer = crate::command::composer_full_mut(&composer); let check_lock = (check_lock && composer @@ -164,7 +181,11 @@ impl ValidateCommand { .get("lock") .as_bool() .unwrap_or(true)) - || input.get_option("check-lock").as_bool().unwrap_or(false); + || input + .borrow() + .get_option("check-lock") + .as_bool() + .unwrap_or(false); // TODO(phase-b): get_missing_requirement_info needs &package from composer while // locker holds &mut composer; cloning lock state isn't trivial. Use todo!() for the // package-arg subexpression below. @@ -202,6 +223,7 @@ impl ValidateCommand { let mut exit_code = exit_code; if input + .borrow() .get_option("with-dependencies") .as_bool() .unwrap_or(false) -- cgit v1.3.1