From e0145a94019f37047f0ebe6e6d83923da234cf7b Mon Sep 17 00:00:00 2001 From: ARCJ137442 <61109168+ARCJ137442@users.noreply.github.com> Date: Thu, 1 Aug 2024 12:01:41 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E7=BB=A7=E7=BB=AD?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E3=80=8C=E8=99=9A=E6=8B=9F=E6=9C=BA=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E3=80=8D=E4=B8=AD=E7=9A=84=E5=87=BD=E6=95=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test_tools/vm_interact/mod.rs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/test_tools/vm_interact/mod.rs b/src/test_tools/vm_interact/mod.rs index 716d50d..5137e68 100644 --- a/src/test_tools/vm_interact/mod.rs +++ b/src/test_tools/vm_interact/mod.rs @@ -222,7 +222,17 @@ fn nal_save_outputs( nal_root_path: &Path, path_str: String, ) -> Result<()> { - // 先收集所有输出的字符串 + let file_str = collect_outputs_to_json(output_cache)?; + // 保存到文件中 | 使用基于`nal_root_path`的相对路径 + let path = nal_root_path.join(path_str.trim()); + std::fs::write(path, file_str)?; + // 提示 | ❌【2024-04-09 22:22:04】执行「NAL输入」时,应始终静默 + // println_cli!([Info] "已将所有NAVM输出保存到文件{path:?}"); + // 返回 + Ok(()) +} + +fn collect_outputs_to_json(output_cache: &mut impl VmOutputCache) -> Result { let mut file_str = "[".to_string(); output_cache.for_each(|output| { // 换行制表 @@ -234,17 +244,9 @@ fn nal_save_outputs( // 继续 ControlFlow::<()>::Continue(()) })?; - // 删去尾后逗号 file_str.pop(); - // 换行,终止符 file_str += "\n]"; - // 保存到文件中 | 使用基于`nal_root_path`的相对路径 - let path = nal_root_path.join(path_str.trim()); - std::fs::write(path, file_str)?; - // 提示 | ❌【2024-04-09 22:22:04】执行「NAL输入」时,应始终静默 - // println_cli!([Info] "已将所有NAVM输出保存到文件{path:?}"); - // 返回 - Ok(()) + Ok(file_str) } fn nal_terminate(