From 0b48f4a46d24248e4c012ef37d25b5963c27a78c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 23 Aug 2026 12:43:10 +0900 Subject: fix(fs): carry file_get_contents results as bytes file_get_contents() and file_get_contents_with_max_length() return Vec instead of a from_utf8_lossy'd String. Call sites whose consumer takes a &str still convert lossily and are marked TODO(bytes). file_get_contents_with_max_length() now reads at most the requested number of bytes instead of the whole file. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/command/bump_command.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/command/bump_command.rs') diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs index e10f7b15..9639cbe9 100644 --- a/crates/shirabe/src/command/bump_command.rs +++ b/crates/shirabe/src/command/bump_command.rs @@ -73,8 +73,8 @@ impl BumpCommand { let composer_json = JsonFile::new(composer_json_path.clone(), None, None)?; let contents = match file_get_contents(composer_json.get_path()) { - Some(c) => c, - None => { + Ok(c) => c, + Err(_) => { io.write_error3( &format!("{} is not readable.", composer_json_path), true, @@ -86,7 +86,7 @@ impl BumpCommand { if !is_writable(&composer_json_path) && Silencer::call(|| { - file_put_contents(&composer_json_path, contents.as_bytes()) + file_put_contents(&composer_json_path, &contents) .map(|_| ()) .ok_or_else(|| anyhow::anyhow!("file_put_contents failed")) }) @@ -305,8 +305,9 @@ impl BumpCommand { updates: &indexmap::IndexMap<&str, indexmap::IndexMap>, ) -> anyhow::Result { let contents = match file_get_contents(json.get_path()) { - Some(c) => c, - None => { + // TODO(bytes): JsonManipulator takes the JSON as a String. + Ok(c) => String::from_utf8_lossy(&c).into_owned(), + Err(_) => { return Err(shirabe_php_shim::RuntimeException::new(format!( "Unable to read {} contents.", json.get_path() -- cgit v1.3.1-4-g156e