🚚 Rename internal function

ChanTsune · Oct 6, 2024 · 61a36da · 61a36da
1 parent 4ec9095
commit 61a36da
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/cli/src/command/chmod.rs b/cli/src/command/chmod.rs
@@ -2,7 +2,7 @@ use crate::{
     cli::{PasswordArgs, SolidEntriesTransformStrategy, SolidEntriesTransformStrategyArgs},
     command::{
         ask_password,
-        commons::{run_manipulate_entry, TransformStrategyKeepSolid, TransformStrategyUnSolid},
+        commons::{run_transform_entry, TransformStrategyKeepSolid, TransformStrategyUnSolid},
         Command,
     },
     utils::{GlobPatterns, PathPartExt},
@@ -43,7 +43,7 @@ fn archive_chmod(args: ChmodCommand) -> io::Result<()> {
     let globs = GlobPatterns::new(args.files)
         .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
     match args.transform_strategy.strategy() {
-        SolidEntriesTransformStrategy::UnSolid => run_manipulate_entry(
+        SolidEntriesTransformStrategy::UnSolid => run_transform_entry(
             args.archive.remove_part().unwrap(),
             &args.archive,
             || password.as_deref(),
@@ -57,7 +57,7 @@ fn archive_chmod(args: ChmodCommand) -> io::Result<()> {
             },
             TransformStrategyUnSolid,
         ),
-        SolidEntriesTransformStrategy::KeepSolid => run_manipulate_entry(
+        SolidEntriesTransformStrategy::KeepSolid => run_transform_entry(
             args.archive.remove_part().unwrap(),
             &args.archive,
             || password.as_deref(),

diff --git a/cli/src/command/chown.rs b/cli/src/command/chown.rs
@@ -4,7 +4,7 @@ use crate::{
     cli::{PasswordArgs, SolidEntriesTransformStrategy, SolidEntriesTransformStrategyArgs},
     command::{
         ask_password,
-        commons::{run_manipulate_entry, TransformStrategyKeepSolid, TransformStrategyUnSolid},
+        commons::{run_transform_entry, TransformStrategyKeepSolid, TransformStrategyUnSolid},
         Command,
     },
     utils::{GlobPatterns, PathPartExt},
@@ -42,7 +42,7 @@ fn archive_chown(args: ChownCommand) -> io::Result<()> {
     let globs = GlobPatterns::new(args.files)
         .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
     match args.transform_strategy.strategy() {
-        SolidEntriesTransformStrategy::UnSolid => run_manipulate_entry(
+        SolidEntriesTransformStrategy::UnSolid => run_transform_entry(
             args.archive.remove_part().unwrap(),
             &args.archive,
             || password.as_deref(),
@@ -56,7 +56,7 @@ fn archive_chown(args: ChownCommand) -> io::Result<()> {
             },
             TransformStrategyUnSolid,
         ),
-        SolidEntriesTransformStrategy::KeepSolid => run_manipulate_entry(
+        SolidEntriesTransformStrategy::KeepSolid => run_transform_entry(
             args.archive.remove_part().unwrap(),
             &args.archive,
             || password.as_deref(),

diff --git a/cli/src/command/commons.rs b/cli/src/command/commons.rs
@@ -567,7 +567,7 @@ where
 }
 
 #[cfg(feature = "memmap")]
-pub(crate) fn run_manipulate_entry<'p, O, P, Provider, F, Transform>(
+pub(crate) fn run_transform_entry<'p, O, P, Provider, F, Transform>(
     output_path: O,
     input_path: P,
     mut password_provider: Provider,
@@ -622,7 +622,7 @@ where
 }
 
 #[cfg(not(feature = "memmap"))]
-pub(crate) fn run_manipulate_entry<'p, O, P, Provider, F, Transform>(
+pub(crate) fn run_transform_entry<'p, O, P, Provider, F, Transform>(
     output_path: O,
     input_path: P,
     mut password_provider: Provider,

diff --git a/cli/src/command/delete.rs b/cli/src/command/delete.rs
@@ -4,7 +4,7 @@ use crate::{
     },
     command::{
         ask_password,
-        commons::{run_manipulate_entry, TransformStrategyKeepSolid, TransformStrategyUnSolid},
+        commons::{run_transform_entry, TransformStrategyKeepSolid, TransformStrategyUnSolid},
         Command,
     },
     utils::{GlobPatterns, PathPartExt},
@@ -40,7 +40,7 @@ fn delete_file_from_archive(args: DeleteCommand) -> io::Result<()> {
     let exclude_globs = GlobPatterns::try_from(args.exclude.unwrap_or_default())
         .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
     match args.transform_strategy.strategy() {
-        SolidEntriesTransformStrategy::UnSolid => run_manipulate_entry(
+        SolidEntriesTransformStrategy::UnSolid => run_transform_entry(
             args.output
                 .unwrap_or_else(|| args.file.archive.remove_part().unwrap()),
             &args.file.archive,
@@ -55,7 +55,7 @@ fn delete_file_from_archive(args: DeleteCommand) -> io::Result<()> {
             },
             TransformStrategyUnSolid,
         ),
-        SolidEntriesTransformStrategy::KeepSolid => run_manipulate_entry(
+        SolidEntriesTransformStrategy::KeepSolid => run_transform_entry(
             args.output
                 .unwrap_or_else(|| args.file.archive.remove_part().unwrap()),
             &args.file.archive,

diff --git a/cli/src/command/strip.rs b/cli/src/command/strip.rs
@@ -5,7 +5,7 @@ use crate::{
     },
     command::{
         ask_password,
-        commons::{run_manipulate_entry, TransformStrategyKeepSolid, TransformStrategyUnSolid},
+        commons::{run_transform_entry, TransformStrategyKeepSolid, TransformStrategyUnSolid},
         Command,
     },
     utils::PathPartExt,
@@ -51,15 +51,15 @@ impl Command for StripCommand {
 fn strip_metadata(args: StripCommand) -> io::Result<()> {
     let password = ask_password(args.password)?;
     match args.transform_strategy.strategy() {
-        SolidEntriesTransformStrategy::UnSolid => run_manipulate_entry(
+        SolidEntriesTransformStrategy::UnSolid => run_transform_entry(
             args.output
                 .unwrap_or_else(|| args.file.archive.remove_part().unwrap()),
             &args.file.archive,
             || password.as_deref(),
             |entry| Ok(Some(strip_entry_metadata(entry?, &args.strip_options))),
             TransformStrategyUnSolid,
         ),
-        SolidEntriesTransformStrategy::KeepSolid => run_manipulate_entry(
+        SolidEntriesTransformStrategy::KeepSolid => run_transform_entry(
             args.output
                 .unwrap_or_else(|| args.file.archive.remove_part().unwrap()),
             &args.file.archive,

diff --git a/cli/src/command/xattr.rs b/cli/src/command/xattr.rs
@@ -3,7 +3,7 @@ use crate::{
     command::{
         ask_password,
         commons::{
-            run_entries, run_manipulate_entry, TransformStrategyKeepSolid, TransformStrategyUnSolid,
+            run_entries, run_transform_entry, TransformStrategyKeepSolid, TransformStrategyUnSolid,
         },
         Command,
     },
@@ -176,7 +176,7 @@ fn archive_set_xattr(args: SetXattrCommand) -> io::Result<()> {
         .map_or_else(Default::default, |it| it.as_bytes());
 
     match args.transform_strategy.strategy() {
-        SolidEntriesTransformStrategy::UnSolid => run_manipulate_entry(
+        SolidEntriesTransformStrategy::UnSolid => run_transform_entry(
             args.archive.remove_part().unwrap(),
             &args.archive,
             || password.as_deref(),
@@ -195,7 +195,7 @@ fn archive_set_xattr(args: SetXattrCommand) -> io::Result<()> {
             },
             TransformStrategyUnSolid,
         ),
-        SolidEntriesTransformStrategy::KeepSolid => run_manipulate_entry(
+        SolidEntriesTransformStrategy::KeepSolid => run_transform_entry(
             args.archive.remove_part().unwrap(),
             &args.archive,
             || password.as_deref(),