From e3aeb6a1c9955eee2c396230317e63becd24ec6a Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Thu, 26 Feb 2026 00:51:45 +0800 Subject: Replace string type identifiers with TypeId for command output matching --- src/cmds/cmd/hexdump.rs | 4 +++- src/cmds/cmd/sheetdump.rs | 4 +++- src/cmds/cmd/status.rs | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/cmds/cmd') diff --git a/src/cmds/cmd/hexdump.rs b/src/cmds/cmd/hexdump.rs index a0f4a21..82f5d45 100644 --- a/src/cmds/cmd/hexdump.rs +++ b/src/cmds/cmd/hexdump.rs @@ -1,3 +1,5 @@ +use std::any::TypeId; + use crate::{ cmd_output, cmds::{ @@ -36,7 +38,7 @@ async fn collect(args: &Arg, _ctx: &JVCommandContext) -> Result Result<(Box, String), CmdExecuteError> { +) -> Result<(Box, TypeId), CmdExecuteError> { let output = JVHexOutput { data: collect.data }; cmd_output!(output, JVHexOutput) } diff --git a/src/cmds/cmd/sheetdump.rs b/src/cmds/cmd/sheetdump.rs index 3b0953a..defb8ff 100644 --- a/src/cmds/cmd/sheetdump.rs +++ b/src/cmds/cmd/sheetdump.rs @@ -1,3 +1,5 @@ +use std::any::TypeId; + use crate::{ cmd_output, cmds::{ @@ -46,7 +48,7 @@ async fn collect(args: &Arg, _ctx: &JVCommandContext) -> Result Result<(Box, String), CmdExecuteError> { +) -> Result<(Box, TypeId), CmdExecuteError> { let mappings = collect.sheet.mappings(); let mut mappings_vec = mappings.iter().cloned().collect::>(); if input.sort { diff --git a/src/cmds/cmd/status.rs b/src/cmds/cmd/status.rs index c1f2a96..5d5f4a3 100644 --- a/src/cmds/cmd/status.rs +++ b/src/cmds/cmd/status.rs @@ -1,4 +1,4 @@ -use std::{collections::HashMap, time::SystemTime}; +use std::{any::TypeId, collections::HashMap, time::SystemTime}; use crate::{ cmd_output, @@ -84,7 +84,7 @@ async fn collect(_args: &Arg, _ctx: &JVCommandContext) -> Result Result<(Box, String), CmdExecuteError> { +) -> Result<(Box, TypeId), CmdExecuteError> { let mut wrong_modified_items: HashMap = HashMap::new(); -- cgit