From 81b9fc9d92bb74aa8428ae4db39bd84e8c16095c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 20 Jun 2026 18:34:54 +0900 Subject: refactor(php-shim): drop Box wrapping from PhpMixed List/Array The List and Array variants of PhpMixed boxed their elements unnecessarily. Store PhpMixed values directly and update all callers accordingly. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/downloader/download_manager.rs | 2 +- crates/shirabe/src/downloader/file_downloader.rs | 8 ++++---- crates/shirabe/src/downloader/gzip_downloader.rs | 2 +- crates/shirabe/src/downloader/rar_downloader.rs | 2 +- crates/shirabe/src/downloader/xz_downloader.rs | 2 +- crates/shirabe/src/downloader/zip_downloader.rs | 4 +--- 6 files changed, 9 insertions(+), 11 deletions(-) (limited to 'crates/shirabe/src/downloader') diff --git a/crates/shirabe/src/downloader/download_manager.rs b/crates/shirabe/src/downloader/download_manager.rs index 3d4fe9b..23b025f 100644 --- a/crates/shirabe/src/downloader/download_manager.rs +++ b/crates/shirabe/src/downloader/download_manager.rs @@ -510,7 +510,7 @@ impl DownloadManager { &PhpMixed::List( sources .iter() - .map(|s| Box::new(PhpMixed::String(s.clone()))) + .map(|s| PhpMixed::String(s.clone())) .collect(), ), true, diff --git a/crates/shirabe/src/downloader/file_downloader.rs b/crates/shirabe/src/downloader/file_downloader.rs index 3c4f7e2..4c30f9e 100644 --- a/crates/shirabe/src/downloader/file_downloader.rs +++ b/crates/shirabe/src/downloader/file_downloader.rs @@ -338,10 +338,10 @@ impl DownloaderInterface for FileDownloader { && !in_array( PhpMixed::Int(te.get_code()), &PhpMixed::List(vec![ - Box::new(PhpMixed::Int(500)), - Box::new(PhpMixed::Int(502)), - Box::new(PhpMixed::Int(503)), - Box::new(PhpMixed::Int(504)), + PhpMixed::Int(500), + PhpMixed::Int(502), + PhpMixed::Int(503), + PhpMixed::Int(504), ]), true, ) diff --git a/crates/shirabe/src/downloader/gzip_downloader.rs b/crates/shirabe/src/downloader/gzip_downloader.rs index 05ac244..f59fe11 100644 --- a/crates/shirabe/src/downloader/gzip_downloader.rs +++ b/crates/shirabe/src/downloader/gzip_downloader.rs @@ -116,7 +116,7 @@ impl ArchiveDownloader for GzipDownloader { PhpMixed::List( command .iter() - .map(|s| Box::new(PhpMixed::String(s.clone()))) + .map(|s| PhpMixed::String(s.clone())) .collect(), ), Some(&mut process_output), diff --git a/crates/shirabe/src/downloader/rar_downloader.rs b/crates/shirabe/src/downloader/rar_downloader.rs index f2c89c3..29ea491 100644 --- a/crates/shirabe/src/downloader/rar_downloader.rs +++ b/crates/shirabe/src/downloader/rar_downloader.rs @@ -89,7 +89,7 @@ impl ArchiveDownloader for RarDownloader { PhpMixed::List( command .iter() - .map(|s| Box::new(PhpMixed::String(s.clone()))) + .map(|s| PhpMixed::String(s.clone())) .collect(), ), Some(&mut process_output), diff --git a/crates/shirabe/src/downloader/xz_downloader.rs b/crates/shirabe/src/downloader/xz_downloader.rs index f7611fd..d79f9bc 100644 --- a/crates/shirabe/src/downloader/xz_downloader.rs +++ b/crates/shirabe/src/downloader/xz_downloader.rs @@ -76,7 +76,7 @@ impl ArchiveDownloader for XzDownloader { PhpMixed::List( command .iter() - .map(|s| Box::new(PhpMixed::String(s.to_string()))) + .map(|s| PhpMixed::String(s.to_string())) .collect(), ), Some(&mut ignored_output), diff --git a/crates/shirabe/src/downloader/zip_downloader.rs b/crates/shirabe/src/downloader/zip_downloader.rs index 04e71b4..3d72377 100644 --- a/crates/shirabe/src/downloader/zip_downloader.rs +++ b/crates/shirabe/src/downloader/zip_downloader.rs @@ -259,9 +259,7 @@ impl ZipDownloader { .unwrap(); match response_headers.get(&package.get_name()) { Some(list) => PhpMixed::List( - list.iter() - .map(|s| Box::new(PhpMixed::String(s.clone()))) - .collect(), + list.iter().map(|s| PhpMixed::String(s.clone())).collect(), ), None => PhpMixed::List(vec![]), } -- cgit v1.3.1