From 3a6e69596d4f45ba1c50c6e932004e2160799d0c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 7 Jun 2026 11:03:13 +0900 Subject: feat(shirabe): resolve phase-b PhpMixed conversion TODOs Implement self-contained call sites that wrap/unwrap PhpMixed without touching shim bodies: platform-override and authentication IndexMap to PhpMixed conversions, and dev-package-name / version-alias sorts via usort with strcmp/strnatcmp. Drop stale TODO comments where the PhpMixed unwrap was already inlined. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/repository/vcs/vcs_driver.rs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'crates/shirabe/src/repository/vcs/vcs_driver.rs') diff --git a/crates/shirabe/src/repository/vcs/vcs_driver.rs b/crates/shirabe/src/repository/vcs/vcs_driver.rs index d87924a..94c3ff8 100644 --- a/crates/shirabe/src/repository/vcs/vcs_driver.rs +++ b/crates/shirabe/src/repository/vcs/vcs_driver.rs @@ -74,7 +74,6 @@ impl VcsDriverBase { .get("options") .cloned() .unwrap_or(PhpMixed::Array(IndexMap::new())); - // TODO(phase-b): convert PhpMixed::Array options into IndexMap properly. let options: IndexMap = match options_mixed { PhpMixed::Array(a) => a.into_iter().map(|(k, v)| (k, *v)).collect(), _ => IndexMap::new(), @@ -216,7 +215,6 @@ pub trait VcsDriver: VcsDriverInterface { if self.should_cache(identifier) { if let Some(res) = self.cache_mut().and_then(|c| c.read(identifier)) { let parsed = JsonFile::parse_json(Some(&res), None)?; - // TODO(phase-b): unwrap PhpMixed::Array into IndexMap. let parsed_map: Option> = match parsed { PhpMixed::Array(a) => Some(a.into_iter().map(|(k, v)| (k, *v)).collect()), _ => None, @@ -273,7 +271,6 @@ pub trait VcsDriver: VcsDriverInterface { Some(&format!("{}:composer.json", identifier)), )?; - // TODO(phase-b): unwrap PhpMixed::Array into IndexMap. let mut composer: IndexMap = match composer { PhpMixed::Array(a) if !a.is_empty() => a.into_iter().map(|(k, v)| (k, *v)).collect(), _ => return Ok(None), @@ -315,7 +312,6 @@ pub trait VcsDriver: VcsDriverInterface { .get("options") .cloned() .unwrap_or(PhpMixed::Array(IndexMap::new())); - // TODO(phase-b): convert PhpMixed::Array options into IndexMap properly. let options: IndexMap = match options_mixed { PhpMixed::Array(a) => a.into_iter().map(|(k, v)| (k, *v)).collect(), _ => IndexMap::new(), -- cgit v1.3.1