From f411daceacad66e0bd774fda7d3c5ef8533cc55c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 26 May 2026 20:04:02 +0900 Subject: refactor(io): share IOInterface via Rc> handle Co-Authored-By: Claude Opus 4.7 --- crates/shirabe/src/repository/composer_repository.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'crates/shirabe/src/repository/composer_repository.rs') diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs index 5c16f8e..d055e59 100644 --- a/crates/shirabe/src/repository/composer_repository.rs +++ b/crates/shirabe/src/repository/composer_repository.rs @@ -21,6 +21,7 @@ use crate::config::Config; use crate::downloader::TransportException; use crate::event_dispatcher::EventDispatcher; use crate::io::IOInterface; +use crate::io::IOInterfaceImmutable; use crate::json::JsonFile; use crate::package::BasePackageHandle; use crate::package::PackageInterface; @@ -84,7 +85,7 @@ pub struct ComposerRepository { url: String, /// non-empty-string base_url: String, - io: Box, + io: std::rc::Rc>, http_downloader: std::rc::Rc>, r#loop: std::rc::Rc>, pub(crate) cache: Cache, @@ -141,7 +142,7 @@ impl ConfigurableRepositoryInterface for ComposerRepository { impl ComposerRepository { pub fn new( mut repo_config: IndexMap, - io: Box, + io: std::rc::Rc>, config: &Config, http_downloader: std::rc::Rc>, event_dispatcher: Option>>, @@ -258,10 +259,11 @@ impl ComposerRepository { let base_url = base_url_trimmed.trim_end_matches('/').to_string(); assert!(!base_url.is_empty()); - // TODO(phase-b): Cache::new expects Box but io is also stored in self.io; + // TODO(phase-b): Cache::new expects std::rc::Rc> but io is also stored in self.io; // need shared ownership (Rc) for IOInterface. Using todo!() placeholder. - let cache: Cache = - todo!("Cache::new requires Box but io is also moved into self.io"); + let cache: Cache = todo!( + "Cache::new requires std::rc::Rc> but io is also moved into self.io" + ); let version_parser = VersionParser::new(); let loader = ArrayLoader::new(Some(version_parser.clone()), true); @@ -2930,7 +2932,7 @@ impl ComposerRepository { .as_array() .map(|a| a.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()) .unwrap_or_default(); - HttpDownloader::output_warnings(&*self.io, &self.url, &data_local); + HttpDownloader::output_warnings(&*self.io.borrow(), &self.url, &data_local); if let Some(ck) = cache_key_owned.as_ref() { if !ck.is_empty() && !self.cache.is_read_only() { @@ -3127,7 +3129,7 @@ impl ComposerRepository { .as_array() .map(|a| a.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()) .unwrap_or_default(); - HttpDownloader::output_warnings(&*self.io, &self.url, &data); + HttpDownloader::output_warnings(&*self.io.borrow(), &self.url, &data); let last_modified_date = response.get_header("last-modified"); response.collect(); @@ -3305,7 +3307,7 @@ impl ComposerRepository { .as_array() .map(|a| a.iter().map(|(k, v)| (k.clone(), (**v).clone())).collect()) .unwrap_or_default(); - HttpDownloader::output_warnings(self.io.as_ref(), &self.url, &data); + HttpDownloader::output_warnings(&*self.io.borrow(), &self.url, &data); let last_modified_date = response.get_header("last-modified"); response.collect(); -- cgit v1.3.1