👕 Reformat code as rust edition 2024

Author: ChanTsune

cli/benches/create.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use portable_network_archive::{cli, command::Command};
 
 fn bench_store(c: &mut Criterion) {

cli/benches/extract.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use portable_network_archive::{cli, command::Command};
 
 fn bench_store(c: &mut Criterion) {

cli/benches/list.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use portable_network_archive::{cli, command::Command};
 
 fn bench_list_normal(c: &mut Criterion) {

cli/benches/split.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use portable_network_archive::{cli, command::Command};
 
 fn bench_create_with_split(c: &mut Criterion) {

cli/src/chunk/acl.rs

@@ -5,7 +5,7 @@ use std::{
     collections::HashSet,
     error::Error,
     fmt::{self, Display, Formatter},
-    str::{from_utf8, FromStr, Utf8Error},
+    str::{FromStr, Utf8Error, from_utf8},
 };
 
 /// [ChunkType] File Access Control Entry

cli/src/cli.rs

@@ -6,7 +6,7 @@ use crate::command::{
     extract::ExtractCommand, list::ListCommand, split::SplitCommand, strip::StripCommand,
     xattr::XattrCommand,
 };
-use clap::{value_parser, ArgGroup, Parser, Subcommand, ValueEnum, ValueHint};
+use clap::{ArgGroup, Parser, Subcommand, ValueEnum, ValueHint, value_parser};
 use log::{Level, LevelFilter};
 use pna::HashAlgorithm;
 use std::{io, path::PathBuf};

cli/src/command/acl.rs

@@ -4,23 +4,22 @@ use crate::{
         FileArgs, PasswordArgs, SolidEntriesTransformStrategy, SolidEntriesTransformStrategyArgs,
     },
     command::{
-        ask_password,
+        Command, ask_password,
         core::{
-            collect_split_archives, run_entries, run_transform_entry, TransformStrategyKeepSolid,
-            TransformStrategyUnSolid,
+            TransformStrategyKeepSolid, TransformStrategyUnSolid, collect_split_archives,
+            run_entries, run_transform_entry,
         },
-        Command,
     },
     ext::{Acls, NormalEntryExt, PermissionExt},
-    utils::{env::NamedTempFile, GlobPatterns, PathPartExt},
+    utils::{GlobPatterns, PathPartExt, env::NamedTempFile},
 };
 use clap::{ArgGroup, Parser, ValueHint};
 use nom::{
+    Parser as _,
     branch::alt,
     bytes::complete::{tag, take_while},
     character::complete::char,
     combinator::{map, opt},
-    Parser as _,
 };
 use pna::{Chunk, NormalEntry, RawChunk};
 use regex::Regex;

cli/src/command/append.rs

@@ -4,22 +4,20 @@ use crate::{
         PasswordArgs,
     },
     command::{
-        ask_password, check_password,
+        Command, ask_password, check_password,
         core::{
-            collect_items, create_entry, entry_option, read_paths, read_paths_stdin, AclStrategy,
-            CreateOptions, KeepOptions, OwnerOptions, PathFilter, PathTransformers,
+            AclStrategy, CreateOptions, KeepOptions, OwnerOptions, PathFilter, PathTransformers,
             PermissionStrategy, StoreAs, TimeFilter, TimeFilters, TimeOptions, TimestampStrategy,
-            XattrStrategy,
+            XattrStrategy, collect_items, create_entry, entry_option, read_paths, read_paths_stdin,
         },
-        Command,
     },
     utils::{
-        re::{bsd::SubstitutionRule, gnu::TransformRule},
         PathPartExt, VCS_FILES,
+        re::{bsd::SubstitutionRule, gnu::TransformRule},
     },
 };
 use clap::{ArgGroup, Parser, ValueHint};
-use pna::{prelude::*, Archive};
+use pna::{Archive, prelude::*};
 use std::{
     env, fs, io,
     path::{Path, PathBuf},

cli/src/command/chmod.rs

@@ -1,23 +1,22 @@
 use crate::{
     cli::{PasswordArgs, SolidEntriesTransformStrategy, SolidEntriesTransformStrategyArgs},
     command::{
-        ask_password,
+        Command, ask_password,
         core::{
-            collect_split_archives, run_transform_entry, TransformStrategyKeepSolid,
-            TransformStrategyUnSolid,
+            TransformStrategyKeepSolid, TransformStrategyUnSolid, collect_split_archives,
+            run_transform_entry,
         },
-        Command,
     },
-    utils::{env::NamedTempFile, GlobPatterns, PathPartExt},
+    utils::{GlobPatterns, PathPartExt, env::NamedTempFile},
 };
 use bitflags::bitflags;
 use clap::{Parser, ValueHint};
 use nom::{
+    Parser as _,
     branch::alt,
     character::complete::char,
     combinator::{map, opt},
     multi::{many0, many1, separated_list1},
-    Parser as _,
 };
 use pna::NormalEntry;
 use std::{ops::BitOr, path::PathBuf, str::FromStr};

cli/src/command/chown.rs

@@ -1,17 +1,16 @@
 use crate::{
     cli::{PasswordArgs, SolidEntriesTransformStrategy, SolidEntriesTransformStrategyArgs},
     command::{
-        ask_password,
+        Command, ask_password,
         core::{
-            collect_split_archives, run_transform_entry, TransformStrategyKeepSolid,
-            TransformStrategyUnSolid,
+            TransformStrategyKeepSolid, TransformStrategyUnSolid, collect_split_archives,
+            run_transform_entry,
         },
-        Command,
     },
     utils::{
+        GlobPatterns, PathPartExt,
         env::NamedTempFile,
         fs::{Group, User},
-        GlobPatterns, PathPartExt,
     },
 };
 use clap::{ArgGroup, Parser, ValueHint};