cargo fmt post edition bump

Keats · Keats · commit e72a3d4b53f8 · 2025-09-29T21:37:12.000+02:00
diff --git a/benches/jwt.rs b/benches/jwt.rs
@@ -1,5 +1,5 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use jsonwebtoken::{decode, encode, Algorithm, DecodingKey, EncodingKey, Header, Validation};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
+use jsonwebtoken::{Algorithm, DecodingKey, EncodingKey, Header, Validation, decode, encode};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
diff --git a/examples/auth0.rs b/examples/auth0.rs
@@ -2,7 +2,7 @@
 use std::collections::HashMap;
 
 use jsonwebtoken::jwk::{AlgorithmParameters, JwkSet};
-use jsonwebtoken::{decode, decode_header, DecodingKey, Validation};
+use jsonwebtoken::{DecodingKey, Validation, decode, decode_header};
 
 const TOKEN: &str = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IjFaNTdkX2k3VEU2S1RZNTdwS3pEeSJ9.eyJpc3MiOiJodHRwczovL2Rldi1kdXp5YXlrNC5ldS5hdXRoMC5jb20vIiwic3ViIjoiNDNxbW44c281R3VFU0U1N0Fkb3BhN09jYTZXeVNidmRAY2xpZW50cyIsImF1ZCI6Imh0dHBzOi8vZGV2LWR1enlheWs0LmV1LmF1dGgwLmNvbS9hcGkvdjIvIiwiaWF0IjoxNjIzNTg1MzAxLCJleHAiOjE2MjM2NzE3MDEsImF6cCI6IjQzcW1uOHNvNUd1RVNFNTdBZG9wYTdPY2E2V3lTYnZkIiwic2NvcGUiOiJyZWFkOnVzZXJzIiwiZ3R5IjoiY2xpZW50LWNyZWRlbnRpYWxzIn0.0MpewU1GgvRqn4F8fK_-Eu70cUgWA5JJrdbJhkCPCxXP-8WwfI-qx1ZQg2a7nbjXICYAEl-Z6z4opgy-H5fn35wGP0wywDqZpqL35IPqx6d0wRvpPMjJM75zVXuIjk7cEhDr2kaf1LOY9auWUwGzPiDB_wM-R0uvUMeRPMfrHaVN73xhAuQWVjCRBHvNscYS5-i6qBQKDMsql87dwR72DgHzMlaC8NnaGREBC-xiSamesqhKPVyGzSkFSaF3ZKpGrSDapqmHkNW9RDBE3GQ9OHM33vzUdVKOjU1g9Leb9PDt0o1U4p3NQoGJPShQ6zgWSUEaqvUZTfkbpD_DoYDRxA";
 const JWKS_REPLY: &str = r#"
diff --git a/examples/custom_header.rs b/examples/custom_header.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
 use jsonwebtoken::errors::ErrorKind;
-use jsonwebtoken::{decode, encode, Algorithm, DecodingKey, EncodingKey, Header, Validation};
+use jsonwebtoken::{Algorithm, DecodingKey, EncodingKey, Header, Validation, decode, encode};
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 struct Claims {
diff --git a/examples/custom_time.rs b/examples/custom_time.rs
@@ -64,7 +64,7 @@ mod jwt_numeric_date {
         use time::{Duration, OffsetDateTime};
 
         use jsonwebtoken::{
-            decode, encode, Algorithm, DecodingKey, EncodingKey, Header, Validation,
+            Algorithm, DecodingKey, EncodingKey, Header, Validation, decode, encode,
         };
 
         use super::super::{Claims, SECRET};
diff --git a/examples/ed25519.rs b/examples/ed25519.rs
@@ -1,10 +1,10 @@
-use ed25519_dalek::pkcs8::EncodePrivateKey;
 use ed25519_dalek::SigningKey;
+use ed25519_dalek::pkcs8::EncodePrivateKey;
 use rand_core::OsRng;
 use serde::{Deserialize, Serialize};
 
 use jsonwebtoken::{
-    decode, encode, get_current_timestamp, Algorithm, DecodingKey, EncodingKey, Validation,
+    Algorithm, DecodingKey, EncodingKey, Validation, decode, encode, get_current_timestamp,
 };
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
diff --git a/examples/validation.rs b/examples/validation.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 use jsonwebtoken::errors::ErrorKind;
-use jsonwebtoken::{decode, encode, Algorithm, DecodingKey, EncodingKey, Header, Validation};
+use jsonwebtoken::{Algorithm, DecodingKey, EncodingKey, Header, Validation, decode, encode};
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 struct Claims {
diff --git a/src/crypto/aws_lc/ecdsa.rs b/src/crypto/aws_lc/ecdsa.rs
@@ -3,12 +3,12 @@
 
 use crate::algorithms::AlgorithmFamily;
 use crate::crypto::{JwtSigner, JwtVerifier};
-use crate::errors::{new_error, ErrorKind, Result};
+use crate::errors::{ErrorKind, Result, new_error};
 use crate::{Algorithm, DecodingKey, EncodingKey};
 use aws_lc_rs::rand::SystemRandom;
 use aws_lc_rs::signature::{
-    EcdsaKeyPair, VerificationAlgorithm, ECDSA_P256_SHA256_FIXED, ECDSA_P256_SHA256_FIXED_SIGNING,
-    ECDSA_P384_SHA384_FIXED, ECDSA_P384_SHA384_FIXED_SIGNING,
+    ECDSA_P256_SHA256_FIXED, ECDSA_P256_SHA256_FIXED_SIGNING, ECDSA_P384_SHA384_FIXED,
+    ECDSA_P384_SHA384_FIXED_SIGNING, EcdsaKeyPair, VerificationAlgorithm,
 };
 use signature::{Error, Signer, Verifier};
 
diff --git a/src/crypto/aws_lc/eddsa.rs b/src/crypto/aws_lc/eddsa.rs
@@ -2,9 +2,9 @@
 
 use crate::algorithms::AlgorithmFamily;
 use crate::crypto::{JwtSigner, JwtVerifier};
-use crate::errors::{new_error, ErrorKind, Result};
+use crate::errors::{ErrorKind, Result, new_error};
 use crate::{Algorithm, DecodingKey, EncodingKey};
-use aws_lc_rs::signature::{Ed25519KeyPair, VerificationAlgorithm, ED25519};
+use aws_lc_rs::signature::{ED25519, Ed25519KeyPair, VerificationAlgorithm};
 use signature::{Error, Signer, Verifier};
 
 pub struct EdDSASigner(Ed25519KeyPair);
diff --git a/src/crypto/aws_lc/rsa.rs b/src/crypto/aws_lc/rsa.rs
@@ -7,7 +7,7 @@ use signature::{Signer, Verifier};
 use crate::algorithms::AlgorithmFamily;
 use crate::crypto::{JwtSigner, JwtVerifier};
 use crate::decoding::DecodingKeyKind;
-use crate::errors::{new_error, ErrorKind, Result};
+use crate::errors::{ErrorKind, Result, new_error};
 use crate::{Algorithm, DecodingKey, EncodingKey};
 
 /// Try to sign the `message` using an `RSA` `algorithm`.
diff --git a/src/crypto/rust_crypto/ecdsa.rs b/src/crypto/rust_crypto/ecdsa.rs
@@ -3,7 +3,7 @@
 
 use crate::algorithms::AlgorithmFamily;
 use crate::crypto::{JwtSigner, JwtVerifier};
-use crate::errors::{new_error, ErrorKind, Result};
+use crate::errors::{ErrorKind, Result, new_error};
 use crate::{Algorithm, DecodingKey, EncodingKey};
 use p256::ecdsa::{
     Signature as Signature256, SigningKey as SigningKey256, VerifyingKey as VerifyingKey256,
diff --git a/src/crypto/rust_crypto/eddsa.rs b/src/crypto/rust_crypto/eddsa.rs
@@ -2,7 +2,7 @@
 
 use crate::algorithms::AlgorithmFamily;
 use crate::crypto::{JwtSigner, JwtVerifier};
-use crate::errors::{new_error, ErrorKind, Result};
+use crate::errors::{ErrorKind, Result, new_error};
 use crate::{Algorithm, DecodingKey, EncodingKey};
 use ed25519_dalek::pkcs8::DecodePrivateKey;
 use ed25519_dalek::{Signature, SigningKey, VerifyingKey};
diff --git a/src/crypto/rust_crypto/rsa.rs b/src/crypto/rust_crypto/rsa.rs
@@ -3,20 +3,20 @@
 
 use hmac::digest::FixedOutputReset;
 use rsa::{
+    BigUint, Pkcs1v15Sign, Pss, RsaPublicKey,
     pkcs1::{DecodeRsaPrivateKey, DecodeRsaPublicKey},
     pkcs1v15::SigningKey,
     pkcs8::AssociatedOid,
     pss::BlindedSigningKey,
     traits::SignatureScheme,
-    BigUint, Pkcs1v15Sign, Pss, RsaPublicKey,
 };
 use sha2::{Digest, Sha256, Sha384, Sha512};
 use signature::{RandomizedSigner, SignatureEncoding, Signer, Verifier};
 
 use crate::algorithms::AlgorithmFamily;
 use crate::crypto::{JwtSigner, JwtVerifier};
 use crate::decoding::DecodingKeyKind;
-use crate::errors::{new_error, ErrorKind, Result};
+use crate::errors::{ErrorKind, Result, new_error};
 use crate::{Algorithm, DecodingKey, EncodingKey};
 
 fn try_sign_rsa<H>(
diff --git a/src/decoding.rs b/src/decoding.rs
@@ -1,18 +1,18 @@
 use std::fmt::{Debug, Formatter};
 
-use base64::{engine::general_purpose::STANDARD, Engine};
+use base64::{Engine, engine::general_purpose::STANDARD};
 use serde::de::DeserializeOwned;
 
+use crate::Algorithm;
 use crate::algorithms::AlgorithmFamily;
 use crate::crypto::JwtVerifier;
-use crate::errors::{new_error, ErrorKind, Result};
+use crate::errors::{ErrorKind, Result, new_error};
 use crate::header::Header;
 use crate::jwk::{AlgorithmParameters, Jwk};
 #[cfg(feature = "use_pem")]
 use crate::pem::decoder::PemEncodedKey;
-use crate::serialization::{b64_decode, DecodedJwtPartClaims};
-use crate::validation::{validate, Validation};
-use crate::Algorithm;
+use crate::serialization::{DecodedJwtPartClaims, b64_decode};
+use crate::validation::{Validation, validate};
 // Crypto
 #[cfg(feature = "aws_lc_rs")]
 use crate::crypto::aws_lc::{
diff --git a/src/encoding.rs b/src/encoding.rs
@@ -1,19 +1,19 @@
 use std::fmt::{Debug, Formatter};
 
 use base64::{
-    engine::general_purpose::{STANDARD, URL_SAFE},
     Engine,
+    engine::general_purpose::{STANDARD, URL_SAFE},
 };
 use serde::ser::Serialize;
 
+use crate::Algorithm;
 use crate::algorithms::AlgorithmFamily;
 use crate::crypto::JwtSigner;
-use crate::errors::{new_error, ErrorKind, Result};
+use crate::errors::{ErrorKind, Result, new_error};
 use crate::header::Header;
 #[cfg(feature = "use_pem")]
 use crate::pem::decoder::PemEncodedKey;
 use crate::serialization::{b64_encode, b64_encode_part};
-use crate::Algorithm;
 // Crypto
 #[cfg(feature = "aws_lc_rs")]
 use crate::crypto::aws_lc::{
diff --git a/src/header.rs b/src/header.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::result;
 
-use base64::{engine::general_purpose::STANDARD, Engine};
+use base64::{Engine, engine::general_purpose::STANDARD};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 use crate::algorithms::Algorithm;
diff --git a/src/jwk.rs b/src/jwk.rs
@@ -6,12 +6,12 @@
 
 use std::{fmt, str::FromStr};
 
-use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
 
 use crate::serialization::b64_encode;
 use crate::{
-    errors::{self, Error, ErrorKind},
     Algorithm, EncodingKey,
+    errors::{self, Error, ErrorKind},
 };
 
 #[cfg(feature = "aws_lc_rs")]
@@ -23,7 +23,7 @@ use p256::{ecdsa::SigningKey as P256SigningKey, pkcs8::DecodePrivateKey};
 #[cfg(feature = "rust_crypto")]
 use p384::ecdsa::SigningKey as P384SigningKey;
 #[cfg(feature = "rust_crypto")]
-use rsa::{pkcs1::DecodeRsaPrivateKey, traits::PublicKeyParts, RsaPrivateKey};
+use rsa::{RsaPrivateKey, pkcs1::DecodeRsaPrivateKey, traits::PublicKeyParts};
 #[cfg(feature = "rust_crypto")]
 use sha2::{Digest, Sha256, Sha384, Sha512};
 
@@ -462,7 +462,7 @@ fn extract_ec_public_key_coordinates(
     alg: Algorithm,
 ) -> errors::Result<(EllipticCurve, Vec<u8>, Vec<u8>)> {
     use aws_lc_rs::signature::{
-        EcdsaKeyPair, ECDSA_P256_SHA256_FIXED_SIGNING, ECDSA_P384_SHA384_FIXED_SIGNING,
+        ECDSA_P256_SHA256_FIXED_SIGNING, ECDSA_P384_SHA384_FIXED_SIGNING, EcdsaKeyPair,
     };
 
     let (signing_alg, curve, pub_elem_bytes) = match alg {
@@ -664,12 +664,12 @@ mod tests {
     use serde_json::json;
     use wasm_bindgen_test::wasm_bindgen_test;
 
+    use crate::Algorithm;
     use crate::jwk::{
         AlgorithmParameters, Jwk, JwkSet, KeyAlgorithm, OctetKeyType, RSAKeyParameters,
         ThumbprintHash,
     };
     use crate::serialization::b64_encode;
-    use crate::Algorithm;
 
     #[test]
     #[wasm_bindgen_test]
diff --git a/src/jws.rs b/src/jws.rs
@@ -2,8 +2,8 @@
 use std::marker::PhantomData;
 
 use crate::crypto::sign;
-use crate::errors::{new_error, ErrorKind, Result};
-use crate::serialization::{b64_encode_part, DecodedJwtPartClaims};
+use crate::errors::{ErrorKind, Result, new_error};
+use crate::serialization::{DecodedJwtPartClaims, b64_encode_part};
 use crate::validation::validate;
 use crate::{DecodingKey, EncodingKey, Header, TokenData, Validation};
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -12,10 +12,10 @@ compile_error!(
 compile_error!("at least one of the features \"rust_crypto\" or \"aws_lc_rs\" must be enabled");
 
 pub use algorithms::Algorithm;
-pub use decoding::{decode, decode_header, DecodingKey, TokenData};
-pub use encoding::{encode, EncodingKey};
+pub use decoding::{DecodingKey, TokenData, decode, decode_header};
+pub use encoding::{EncodingKey, encode};
 pub use header::Header;
-pub use validation::{get_current_timestamp, Validation};
+pub use validation::{Validation, get_current_timestamp};
 
 mod algorithms;
 /// Lower level functions, if you want to do something other than JWTs
diff --git a/src/serialization.rs b/src/serialization.rs
@@ -1,4 +1,4 @@
-use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
+use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD};
 use serde::{Deserialize, Serialize};
 
 use crate::errors::Result;
diff --git a/src/validation.rs b/src/validation.rs
@@ -7,7 +7,7 @@ use serde::de::{self, Visitor};
 use serde::{Deserialize, Deserializer};
 
 use crate::algorithms::Algorithm;
-use crate::errors::{new_error, ErrorKind, Result};
+use crate::errors::{ErrorKind, Result, new_error};
 
 /// Contains the various validations that are applied after decoding a JWT.
 ///
@@ -390,10 +390,10 @@ mod tests {
     use serde_json::json;
     use wasm_bindgen_test::wasm_bindgen_test;
 
-    use crate::errors::ErrorKind;
     use crate::Algorithm;
+    use crate::errors::ErrorKind;
 
-    use super::{get_current_timestamp, validate, ClaimsForValidation, Validation};
+    use super::{ClaimsForValidation, Validation, get_current_timestamp, validate};
 
     fn deserialize_claims(claims: &serde_json::Value) -> ClaimsForValidation<'_> {
         serde::Deserialize::deserialize(claims).unwrap()
diff --git a/tests/ecdsa/mod.rs b/tests/ecdsa/mod.rs
@@ -4,11 +4,11 @@ use time::OffsetDateTime;
 use wasm_bindgen_test::wasm_bindgen_test;
 
 use jsonwebtoken::{
-    crypto::{sign, verify},
     Algorithm, DecodingKey, EncodingKey,
+    crypto::{sign, verify},
 };
 #[cfg(feature = "use_pem")]
-use jsonwebtoken::{decode, encode, Header, Validation};
+use jsonwebtoken::{Header, Validation, decode, encode};
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct Claims {
diff --git a/tests/eddsa/mod.rs b/tests/eddsa/mod.rs
@@ -4,11 +4,11 @@ use time::OffsetDateTime;
 use wasm_bindgen_test::wasm_bindgen_test;
 
 use jsonwebtoken::{
-    crypto::{sign, verify},
     Algorithm, DecodingKey, EncodingKey,
+    crypto::{sign, verify},
 };
 #[cfg(feature = "use_pem")]
-use jsonwebtoken::{decode, encode, Header, Validation};
+use jsonwebtoken::{Header, Validation, decode, encode};
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct Claims {
diff --git a/tests/header/mod.rs b/tests/header/mod.rs
@@ -1,4 +1,4 @@
-use base64::{engine::general_purpose::STANDARD, Engine};
+use base64::{Engine, engine::general_purpose::STANDARD};
 use wasm_bindgen_test::wasm_bindgen_test;
 
 use jsonwebtoken::Header;
diff --git a/tests/hmac.rs b/tests/hmac.rs
@@ -6,8 +6,9 @@ use wasm_bindgen_test::wasm_bindgen_test;
 use jsonwebtoken::errors::ErrorKind;
 use jsonwebtoken::jwk::Jwk;
 use jsonwebtoken::{
+    Algorithm, DecodingKey, EncodingKey, Header, Validation,
     crypto::{sign, verify},
-    decode, decode_header, encode, Algorithm, DecodingKey, EncodingKey, Header, Validation,
+    decode, decode_header, encode,
 };
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
@@ -174,8 +175,7 @@ fn decode_token_missing_parts() {
 #[test]
 #[wasm_bindgen_test]
 fn decode_token_invalid_signature() {
-    let token =
-        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJiQGIuY29tIiwiY29tcGFueSI6IkFDTUUifQ.Hm0yvKH25TavFPz7J_coST9lZFYH1hQo0tvhvImmaks";
+    let token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJiQGIuY29tIiwiY29tcGFueSI6IkFDTUUifQ.Hm0yvKH25TavFPz7J_coST9lZFYH1hQo0tvhvImmaks";
     let claims = decode::<Claims>(
         token,
         &DecodingKey::from_secret(b"secret"),
diff --git a/tests/rsa/mod.rs b/tests/rsa/mod.rs
@@ -4,11 +4,11 @@ use time::OffsetDateTime;
 use wasm_bindgen_test::wasm_bindgen_test;
 
 use jsonwebtoken::{
-    crypto::{sign, verify},
     Algorithm, DecodingKey, EncodingKey,
+    crypto::{sign, verify},
 };
 #[cfg(feature = "use_pem")]
-use jsonwebtoken::{decode, encode, Header, Validation};
+use jsonwebtoken::{Header, Validation, decode, encode};
 
 const RSA_ALGORITHMS: &[Algorithm] = &[
     Algorithm::RS256,
