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/plugin/plugin_manager.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'crates/shirabe/src/plugin/plugin_manager.rs') diff --git a/crates/shirabe/src/plugin/plugin_manager.rs b/crates/shirabe/src/plugin/plugin_manager.rs index 04c53d08..bc434262 100644 --- a/crates/shirabe/src/plugin/plugin_manager.rs +++ b/crates/shirabe/src/plugin/plugin_manager.rs @@ -434,10 +434,13 @@ impl PluginManager { let path = class_loader.find_file(&class).unwrap_or_else(|| { panic!("plugin class `{class}` is already defined but has no autoloadable file") }); - // TODO(bytes): file_get_contents is lossy UTF-8; the eval'd plugin source - // should be carried as bytes. - let code = file_get_contents(&path) - .unwrap_or_else(|| panic!("unable to read the plugin class file `{path}`")); + // TODO(bytes): the eval'd plugin source is carried as a String, so + // from_utf8_lossy corrupts a source file that is not valid UTF-8. + let code = + String::from_utf8_lossy(&file_get_contents(&path).unwrap_or_else(|_| { + panic!("unable to read the plugin class file `{path}`") + })) + .into_owned(); let class_counter = CLASS_COUNTER.load(std::sync::atomic::Ordering::Relaxed); let separator_pos = strrpos(&class, "\\"); let mut class_name = class.clone(); -- cgit v1.3.1-4-g156e