diff options
| author | 魏曹先生 <1992414357@qq.com> | 2026-02-26 00:51:45 +0800 |
|---|---|---|
| committer | 魏曹先生 <1992414357@qq.com> | 2026-02-26 01:02:42 +0800 |
| commit | e3aeb6a1c9955eee2c396230317e63becd24ec6a (patch) | |
| tree | 5c70b2a73fb32ed1a717463c81a99e346d3c25e6 /src/cmds/cmd | |
| parent | ae06e0b30a328508f48c108fabcccdf1d23c5643 (diff) | |
Replace string type identifiers with TypeId for command output matching
Diffstat (limited to 'src/cmds/cmd')
| -rw-r--r-- | src/cmds/cmd/hexdump.rs | 4 | ||||
| -rw-r--r-- | src/cmds/cmd/sheetdump.rs | 4 | ||||
| -rw-r--r-- | src/cmds/cmd/status.rs | 4 |
3 files changed, 8 insertions, 4 deletions
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<Collect, CmdPrep async fn exec( _input: In, collect: Collect, -) -> Result<(Box<dyn std::any::Any + Send + 'static>, String), CmdExecuteError> { +) -> Result<(Box<dyn std::any::Any + Send + 'static>, 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<Collect, CmdPrep async fn exec( input: In, collect: Collect, -) -> Result<(Box<dyn std::any::Any + Send + 'static>, String), CmdExecuteError> { +) -> Result<(Box<dyn std::any::Any + Send + 'static>, TypeId), CmdExecuteError> { let mappings = collect.sheet.mappings(); let mut mappings_vec = mappings.iter().cloned().collect::<Vec<LocalMapping>>(); 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<Collect, CmdPre async fn exec( _input: In, collect: Collect, -) -> Result<(Box<dyn std::any::Any + Send + 'static>, String), CmdExecuteError> { +) -> Result<(Box<dyn std::any::Any + Send + 'static>, TypeId), CmdExecuteError> { let mut wrong_modified_items: HashMap<ModifiedRelativePathBuf, JVStatusWrongModifyReason> = HashMap::new(); |