From 92d2199afcecd0056e82d2559700769715401ef0 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Thu, 6 Aug 2026 03:46:41 +0900 Subject: refactor(php-shim): take filesystem paths as impl AsRef The shim's filesystem entry points took `&str` even though each one resolves to a local path through `std::fs` or a syscall, so callers holding a `PathBuf` had to stringify it at the call site. They now take `impl AsRef`, the form `file_exists`, `is_dir`, `unlink` and the rest of the already-converted set use. `Phar`, `PharData` and `ZipArchive` keep their archive path as a `PathBuf`. `PharData::compress` names the compressed sibling by appending the suffix to the file name rather than formatting the path into a `String`. Arguments PHP resolves through a stream wrapper (`fopen`, `file_put_contents`, `include`) still take `&str`, as do the byte-string operations (`dirname`, `basename`, `pathinfo`) and archive-internal entry names, which are `/`-joined logical names rather than OS paths. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe-php-shim/src/compress.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/shirabe-php-shim/src/compress.rs') diff --git a/crates/shirabe-php-shim/src/compress.rs b/crates/shirabe-php-shim/src/compress.rs index d62be7c6..378045b0 100644 --- a/crates/shirabe-php-shim/src/compress.rs +++ b/crates/shirabe-php-shim/src/compress.rs @@ -7,12 +7,12 @@ use std::io::Write as _; #[derive(Debug, Clone)] pub struct GzFile(std::rc::Rc>>); -pub fn gzopen(file: &str, mode: &str) -> Result { +pub fn gzopen(file: impl AsRef, mode: &str) -> Result { assert!( mode.starts_with('r'), "gzopen: only read modes are supported (got {mode:?})" ); - let f = std::fs::File::open(file)?; + let f = std::fs::File::open(file.as_ref())?; Ok(GzFile(std::rc::Rc::new(std::cell::RefCell::new( flate2::read::MultiGzDecoder::new(f), )))) -- cgit v1.3.1