Reformat with style_edition = "2024"

Author: Kijewski

api/src/lib.rs

@@ -35,8 +35,8 @@ use std::io::{self, Read};
 
 #[doc(no_inline)]
 pub use ed25519_dalek::{
-    Signature, SignatureError, SigningKey, VerifyingKey, KEYPAIR_LENGTH, PUBLIC_KEY_LENGTH,
-    SIGNATURE_LENGTH,
+    KEYPAIR_LENGTH, PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH, Signature, SignatureError, SigningKey,
+    VerifyingKey,
 };
 
 /// The unsigned hash of an input file

api/src/sign/mod.rs

@@ -8,11 +8,11 @@ mod zip;
 use std::io::Read;
 
 #[cfg(feature = "sign-tar")]
-pub use self::tar::{copy_and_sign_tar, SignTarError};
+pub use self::tar::{SignTarError, copy_and_sign_tar};
 #[cfg(feature = "sign-zip")]
-pub use self::zip::{copy_and_sign_zip, SignZipError};
-use crate::constants::{SignatureCountLeInt, BUF_LIMIT, HEADER_SIZE, MAGIC_HEADER};
-use crate::{Prehash, SignatureError, SigningKey, KEYPAIR_LENGTH, SIGNATURE_LENGTH};
+pub use self::zip::{SignZipError, copy_and_sign_zip};
+use crate::constants::{BUF_LIMIT, HEADER_SIZE, MAGIC_HEADER, SignatureCountLeInt};
+use crate::{KEYPAIR_LENGTH, Prehash, SIGNATURE_LENGTH, SignatureError, SigningKey};
 
 crate::Error! {
     /// An error returned by [`read_signing_keys()`]

api/src/sign/tar.rs

@@ -1,14 +1,14 @@
 #![cfg_attr(docsrs, doc(cfg(feature = "sign-tar")))]
 
-use std::io::{copy, Read, Seek, Write};
+use std::io::{Read, Seek, Write, copy};
 
-use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
+use base64::prelude::BASE64_STANDARD;
 use ed25519_dalek::SIGNATURE_LENGTH;
 
-use super::{gather_signature_data, GatherSignatureDataError};
+use super::{GatherSignatureDataError, gather_signature_data};
 use crate::constants::{
-    SignatureCountLeInt, BUF_LIMIT, GZIP_END, GZIP_EXTRA, GZIP_START, HEADER_SIZE,
+    BUF_LIMIT, GZIP_END, GZIP_EXTRA, GZIP_START, HEADER_SIZE, SignatureCountLeInt,
 };
 use crate::{Prehash, SigningKey};
 

api/src/sign/zip.rs

@@ -2,10 +2,10 @@
 
 use std::io::{IoSlice, Read, Seek, SeekFrom, Write};
 
-use super::{gather_signature_data, GatherSignatureDataError};
-use crate::constants::{SignatureCountLeInt, BUF_LIMIT, HEADER_SIZE};
-use crate::sign_unsign_zip::{copy_zip, CopyZipError};
-use crate::{Prehash, SigningKey, SIGNATURE_LENGTH};
+use super::{GatherSignatureDataError, gather_signature_data};
+use crate::constants::{BUF_LIMIT, HEADER_SIZE, SignatureCountLeInt};
+use crate::sign_unsign_zip::{CopyZipError, copy_zip};
+use crate::{Prehash, SIGNATURE_LENGTH, SigningKey};
 
 crate::Error! {
     /// An error returned by [`copy_and_sign_zip()`]

api/src/unsign/mod.rs

@@ -6,6 +6,6 @@ mod tar;
 mod zip;
 
 #[cfg(feature = "unsign-tar")]
-pub use self::tar::{copy_and_unsign_tar, UnsignTarError};
+pub use self::tar::{UnsignTarError, copy_and_unsign_tar};
 #[cfg(feature = "unsign-zip")]
-pub use self::zip::{copy_and_unsign_zip, UnsignZipError};
+pub use self::zip::{UnsignZipError, copy_and_unsign_zip};

api/src/unsign/tar.rs

@@ -1,10 +1,10 @@
 #![cfg_attr(docsrs, doc(cfg(feature = "unsign-tar")))]
 
-use std::io::{copy, Read, Seek, Write};
+use std::io::{Read, Seek, Write, copy};
 
 use crate::verify_unsign_tar::{
-    tar_find_data_start_and_len, tar_read_signatures, TarFindDataStartAndLenError,
-    TarReadSignaturesError,
+    TarFindDataStartAndLenError, TarReadSignaturesError, tar_find_data_start_and_len,
+    tar_read_signatures,
 };
 
 crate::Error! {

api/src/unsign/zip.rs

@@ -2,7 +2,7 @@
 
 use std::io::{Read, Seek, Write};
 
-use crate::sign_unsign_zip::{copy_zip, CopyZipError};
+use crate::sign_unsign_zip::{CopyZipError, copy_zip};
 
 crate::Error! {
     /// An error returned by [`copy_and_unsign_zip()`]

api/src/verify/mod.rs

@@ -8,12 +8,12 @@ mod zip;
 use std::io::Read;
 
 #[cfg(feature = "verify-tar")]
-pub use self::tar::{verify_tar, VerifyTarError};
+pub use self::tar::{VerifyTarError, verify_tar};
 #[cfg(feature = "verify-zip")]
-pub use self::zip::{verify_zip, VerifyZipError};
-use crate::constants::{SignatureCountLeInt, BUF_LIMIT, HEADER_SIZE, MAGIC_HEADER};
+pub use self::zip::{VerifyZipError, verify_zip};
+use crate::constants::{BUF_LIMIT, HEADER_SIZE, MAGIC_HEADER, SignatureCountLeInt};
 use crate::{
-    Prehash, Signature, SignatureError, VerifyingKey, PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH,
+    PUBLIC_KEY_LENGTH, Prehash, SIGNATURE_LENGTH, Signature, SignatureError, VerifyingKey,
 };
 
 crate::Error! {

api/src/verify/tar.rs

@@ -2,10 +2,10 @@
 
 use std::io::{Read, Seek};
 
-use super::{find_match, NoMatch};
+use super::{NoMatch, find_match};
 use crate::verify_unsign_tar::{
-    tar_find_data_start_and_len, tar_read_signatures, TarFindDataStartAndLenError,
-    TarReadSignaturesError,
+    TarFindDataStartAndLenError, TarReadSignaturesError, tar_find_data_start_and_len,
+    tar_read_signatures,
 };
 use crate::{Prehash, VerifyingKey};
 

api/src/verify/zip.rs

@@ -2,7 +2,7 @@
 
 use std::io::{Read, Seek};
 
-use super::{find_match, read_signatures, NoMatch, ReadSignaturesError, VerifyingKey};
+use super::{NoMatch, ReadSignaturesError, VerifyingKey, find_match, read_signatures};
 use crate::{Prehash, Signature};
 
 crate::Error! {

api/src/verify_unsign_tar.rs

@@ -1,12 +1,12 @@
 use std::io::{Read, Seek, SeekFrom};
 use std::mem::size_of;
 
-use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
-use ed25519_dalek::{Signature, SignatureError, SIGNATURE_LENGTH};
+use base64::prelude::BASE64_STANDARD;
+use ed25519_dalek::{SIGNATURE_LENGTH, Signature, SignatureError};
 
 use crate::constants::{
-    SignatureCountLeInt, BUF_LIMIT, GZIP_END, GZIP_START, HEADER_SIZE, MAGIC_HEADER,
+    BUF_LIMIT, GZIP_END, GZIP_START, HEADER_SIZE, MAGIC_HEADER, SignatureCountLeInt,
 };
 
 #[derive(Debug, thiserror::Error)]

rustfmt.toml

@@ -8,7 +8,7 @@ newline_style = "Unix"
 normalize_doc_attributes = true
 overflow_delimited_expr = true
 reorder_impl_items = true
+style_edition = "2024"
 unstable_features = true
 use_field_init_shorthand = true
 use_try_shorthand = true
-version = "Two"

src/generate.rs

@@ -5,7 +5,7 @@ use std::os::unix::prelude::OpenOptionsExt;
 use std::path::PathBuf;
 
 use clap::Parser;
-use ed25519_dalek::{SigningKey, KEYPAIR_LENGTH};
+use ed25519_dalek::{KEYPAIR_LENGTH, SigningKey};
 use rand_core::OsRng;
 
 /// Generate a signing key

src/sign.rs

@@ -1,16 +1,16 @@
-use std::fs::{rename, File};
+use std::fs::{File, rename};
 use std::io::Write;
 use std::path::{Path, PathBuf};
 
 use clap::{Args, Parser, Subcommand};
 use normalize_path::NormalizePath;
+use zipsign_api::Prehash;
 use zipsign_api::sign::{
-    copy_and_sign_tar, copy_and_sign_zip, gather_signature_data, read_signing_keys,
-    GatherSignatureDataError, ReadSigningKeysError, SignTarError, SignZipError,
+    GatherSignatureDataError, ReadSigningKeysError, SignTarError, SignZipError, copy_and_sign_tar,
+    copy_and_sign_zip, gather_signature_data, read_signing_keys,
 };
-use zipsign_api::Prehash;
 
-use crate::{get_context, ImplicitContextError};
+use crate::{ImplicitContextError, get_context};
 
 /// Generate signature for a file
 #[derive(Debug, Parser, Clone)]

src/unsign.rs

@@ -1,10 +1,10 @@
-use std::fs::{rename, File};
+use std::fs::{File, rename};
 use std::path::{Path, PathBuf};
 
 use clap::{Args, Parser, Subcommand};
 use normalize_path::NormalizePath;
 use zipsign_api::unsign::{
-    copy_and_unsign_tar, copy_and_unsign_zip, UnsignTarError, UnsignZipError,
+    UnsignTarError, UnsignZipError, copy_and_unsign_tar, copy_and_unsign_zip,
 };
 
 /// Generate signature for a file

src/verify.rs

@@ -4,12 +4,12 @@ use std::path::PathBuf;
 
 use clap::{Args, Parser, Subcommand};
 use zipsign_api::verify::{
-    collect_keys, find_match, read_signatures, verify_tar, verify_zip, CollectKeysError, NoMatch,
-    ReadSignaturesError, VerifyTarError, VerifyZipError,
+    CollectKeysError, NoMatch, ReadSignaturesError, VerifyTarError, VerifyZipError, collect_keys,
+    find_match, read_signatures, verify_tar, verify_zip,
 };
-use zipsign_api::{Prehash, PUBLIC_KEY_LENGTH};
+use zipsign_api::{PUBLIC_KEY_LENGTH, Prehash};
 
-use crate::{get_context, ImplicitContextError};
+use crate::{ImplicitContextError, get_context};
 
 /// Verify a signature
 #[derive(Debug, Parser, Clone)]