fix cargo format

Author: itanxiao

examples/custom_time.rs

@@ -1,7 +1,8 @@
-use jsonwebtoken::{Algorithm, DecodingKey, EncodingKey, Header, Validation};
 use serde::{Deserialize, Serialize};
 use time::{Duration, OffsetDateTime};
 
+use jsonwebtoken::{Algorithm, DecodingKey, EncodingKey, Header, Validation};
+
 const SECRET: &str = "some-secret";
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
@@ -60,13 +61,15 @@ mod jwt_numeric_date {
 
     #[cfg(test)]
     mod tests {
-        const EXPECTED_TOKEN: &str = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJDdXN0b20gT2Zmc2V0RGF0ZVRpbWUgc2VyL2RlIiwiaWF0IjowLCJleHAiOjMyNTAzNjgwMDAwfQ.BcPipupP9oIV6uFRI6Acn7FMLws_wA3oo6CrfeFF3Gg";
+        use time::{Duration, OffsetDateTime};
 
-        use super::super::{Claims, SECRET};
         use jsonwebtoken::{
             decode, encode, Algorithm, DecodingKey, EncodingKey, Header, Validation,
         };
-        use time::{Duration, OffsetDateTime};
+
+        use super::super::{Claims, SECRET};
+
+        const EXPECTED_TOKEN: &str = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJDdXN0b20gT2Zmc2V0RGF0ZVRpbWUgc2VyL2RlIiwiaWF0IjowLCJleHAiOjMyNTAzNjgwMDAwfQ.BcPipupP9oIV6uFRI6Acn7FMLws_wA3oo6CrfeFF3Gg";
 
         #[test]
         fn round_trip() {

examples/ed25519.rs

@@ -16,7 +16,7 @@ pub struct Claims {
 fn main() {
     let secret_key = SecretKey::random(&mut OsRng);
     let pkcs8 = secret_key.to_pkcs8_pem(Default::default()).unwrap();
-    let pkcs8=   pkcs8.as_bytes();
+    let pkcs8 = pkcs8.as_bytes();
 
     let encoding_key = EncodingKey::from_ed_der(pkcs8);
 
@@ -45,7 +45,7 @@ mod tests {
         fn new() -> Jot {
             let secret_key = SecretKey::random(&mut OsRng);
             let pkcs8 = secret_key.to_pkcs8_pem(Default::default()).unwrap();
-            let pkcs8=   pkcs8.as_bytes();
+            let pkcs8 = pkcs8.as_bytes();
             let encoding_key = EncodingKey::from_ed_der(pkcs8);
 
             let public_key_der = secret_key.public_key().to_public_key_der().unwrap();

examples/validation.rs

@@ -1,6 +1,7 @@
+use serde::{Deserialize, Serialize};
+
 use jsonwebtoken::errors::ErrorKind;
 use jsonwebtoken::{decode, encode, Algorithm, DecodingKey, EncodingKey, Header, Validation};
-use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize)]
 struct Claims {

src/algorithms.rs

@@ -1,7 +1,9 @@
-use crate::errors::{Error, ErrorKind, Result};
-use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 
+use serde::{Deserialize, Serialize};
+
+use crate::errors::{Error, ErrorKind, Result};
+
 #[derive(Debug, Eq, PartialEq, Copy, Clone, Serialize, Deserialize)]
 pub(crate) enum AlgorithmFamily {
     Hmac,

src/crypto/ecdsa.rs

@@ -18,8 +18,8 @@ fn es256_sign(key: &[u8], message: &[u8]) -> Result<String> {
     use p256::ecdsa::{Signature, SigningKey};
     use p256::pkcs8::DecodePrivateKey;
     use p256::SecretKey;
-    let secret_key = SecretKey::from_pkcs8_der(key)
-        .map_err(|_e| crate::errors::ErrorKind::InvalidEcdsaKey)?;
+    let secret_key =
+        SecretKey::from_pkcs8_der(key).map_err(|_e| crate::errors::ErrorKind::InvalidEcdsaKey)?;
     let signing_key: SigningKey = secret_key.into();
 
     let signature: Signature = signing_key.sign(message);
@@ -32,8 +32,8 @@ fn es384_sign(key: &[u8], message: &[u8]) -> Result<String> {
     use p384::ecdsa::{Signature, SigningKey};
     use p384::pkcs8::DecodePrivateKey;
     use p384::SecretKey;
-    let secret_key = SecretKey::from_pkcs8_der(key)
-        .map_err(|_e| crate::errors::ErrorKind::InvalidEcdsaKey)?;
+    let secret_key =
+        SecretKey::from_pkcs8_der(key).map_err(|_e| crate::errors::ErrorKind::InvalidEcdsaKey)?;
     let signing_key: SigningKey = secret_key.into();
     let signature: Signature = signing_key.sign(message);
     let bytes = signature.to_bytes();
@@ -53,8 +53,8 @@ fn es384_verify(signature: &str, message: &[u8], key: &[u8]) -> Result<bool> {
     use p384::ecdsa::{Signature, VerifyingKey};
     use p384::PublicKey;
 
-    let public_key = PublicKey::from_sec1_bytes(key)
-        .map_err(|_e| crate::errors::ErrorKind::InvalidEcdsaKey)?;
+    let public_key =
+        PublicKey::from_sec1_bytes(key).map_err(|_e| crate::errors::ErrorKind::InvalidEcdsaKey)?;
     let verifying_key: VerifyingKey = public_key.into();
     let signature = Signature::from_slice(&b64_decode(signature)?)
         .map_err(|_e| crate::errors::ErrorKind::InvalidSignature)?;
@@ -71,4 +71,4 @@ fn es256_verify(signature: &str, message: &[u8], key: &[u8]) -> Result<bool> {
     let signature = Signature::from_slice(&b64_decode(signature)?)
         .map_err(|_e| crate::errors::ErrorKind::InvalidSignature)?;
     Ok(verifying_key.verify(message, &signature).is_ok())
-}
+}

src/crypto/hmac.rs

@@ -1,9 +1,9 @@
 use hmac::{Hmac, Mac};
 use sha2::{Sha256, Sha384, Sha512};
 
-use crate::Algorithm;
 use crate::errors::Result;
 use crate::serialization::{b64_decode, b64_encode};
+use crate::Algorithm;
 
 type HmacSha256 = Hmac<Sha256>;
 type HmacSha384 = Hmac<Sha384>;
@@ -66,7 +66,6 @@ impl HmacAlgorithm for Box<dyn HmacAlgorithm + '_> {
 }
 
 impl HmacAlgorithm for HmacSha256 {
-
     fn sign(&mut self, message: &[u8]) -> Vec<u8> {
         self.reset();
         self.update(message);
@@ -80,7 +79,6 @@ impl HmacAlgorithm for HmacSha256 {
 }
 
 impl HmacAlgorithm for HmacSha384 {
-
     fn sign(&mut self, message: &[u8]) -> Vec<u8> {
         self.reset();
         self.update(message);
@@ -94,7 +92,6 @@ impl HmacAlgorithm for HmacSha384 {
 }
 
 impl HmacAlgorithm for HmacSha512 {
-
     fn sign(&mut self, message: &[u8]) -> Vec<u8> {
         self.reset();
         self.update(message);
@@ -106,4 +103,4 @@ impl HmacAlgorithm for HmacSha512 {
         self.update(message);
         self.clone().verify_slice(signature).is_ok()
     }
-}
+}

src/jwk.rs

@@ -4,12 +4,14 @@
 //! Most of the code in this file is taken from https://github.com/lawliet89/biscuit but
 //! tweaked to remove the private bits as it's not the goal for this crate currently.
 
+use std::{fmt, str::FromStr};
+
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+
 use crate::{
     errors::{self, Error, ErrorKind},
     Algorithm,
 };
-use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
-use std::{fmt, str::FromStr};
 
 /// The intended usage of the public `KeyType`. This enum is serialized `untagged`
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
@@ -435,11 +437,12 @@ impl JwkSet {
 
 #[cfg(test)]
 mod tests {
+    use serde_json::json;
+    use wasm_bindgen_test::wasm_bindgen_test;
+
     use crate::jwk::{AlgorithmParameters, JwkSet, OctetKeyType};
     use crate::serialization::b64_encode;
     use crate::Algorithm;
-    use serde_json::json;
-    use wasm_bindgen_test::wasm_bindgen_test;
 
     #[test]
     #[wasm_bindgen_test]

src/lib.rs

@@ -3,6 +3,12 @@
 //! Documentation:  [stable](https://docs.rs/jsonwebtoken/)
 #![deny(missing_docs)]
 
+pub use algorithms::Algorithm;
+pub use decoding::{decode, decode_header, DecodingKey, TokenData};
+pub use encoding::{encode, EncodingKey};
+pub use header::Header;
+pub use validation::{get_current_timestamp, Validation};
+
 mod algorithms;
 /// Lower level functions, if you want to do something other than JWTs
 pub mod crypto;
@@ -16,9 +22,3 @@ pub mod jwk;
 mod pem;
 mod serialization;
 mod validation;
-
-pub use algorithms::Algorithm;
-pub use decoding::{decode, decode_header, DecodingKey, TokenData};
-pub use encoding::{encode, EncodingKey};
-pub use header::Header;
-pub use validation::{get_current_timestamp, Validation};

src/validation.rs

@@ -170,12 +170,14 @@ pub(crate) struct ClaimsForValidation<'a> {
     #[serde(borrow)]
     aud: TryParse<Audience<'a>>,
 }
+
 #[derive(Debug)]
 enum TryParse<T> {
     Parsed(T),
     FailedToParse,
     NotPresent,
 }
+
 impl<'de, T: Deserialize<'de>> Deserialize<'de> for TryParse<T> {
     fn deserialize<D: serde::Deserializer<'de>>(
         deserializer: D,
@@ -187,6 +189,7 @@ impl<'de, T: Deserialize<'de>> Deserialize<'de> for TryParse<T> {
         })
     }
 }
+
 impl<T> Default for TryParse<T> {
     fn default() -> Self {
         Self::NotPresent
@@ -212,6 +215,7 @@ enum Issuer<'a> {
 /// We use this struct in this case.
 #[derive(Deserialize, PartialEq, Eq, Hash)]
 struct BorrowedCowIfPossible<'a>(#[serde(borrow)] Cow<'a, str>);
+
 impl std::borrow::Borrow<str> for BorrowedCowIfPossible<'_> {
     fn borrow(&self) -> &str {
         &self.0
@@ -345,14 +349,15 @@ where
 
 #[cfg(test)]
 mod tests {
+    use std::collections::HashSet;
+
     use serde_json::json;
     use wasm_bindgen_test::wasm_bindgen_test;
 
-    use super::{get_current_timestamp, validate, ClaimsForValidation, Validation};
-
     use crate::errors::ErrorKind;
     use crate::Algorithm;
-    use std::collections::HashSet;
+
+    use super::{get_current_timestamp, validate, ClaimsForValidation, Validation};
 
     fn deserialize_claims(claims: &serde_json::Value) -> ClaimsForValidation {
         serde::Deserialize::deserialize(claims).unwrap()

tests/ecdsa/mod.rs

@@ -1,14 +1,14 @@
+use serde::{Deserialize, Serialize};
+#[cfg(feature = "use_pem")]
+use time::OffsetDateTime;
+use wasm_bindgen_test::wasm_bindgen_test;
+
 use jsonwebtoken::{
     crypto::{sign, verify},
     Algorithm, DecodingKey, EncodingKey,
 };
-use serde::{Deserialize, Serialize};
-
 #[cfg(feature = "use_pem")]
 use jsonwebtoken::{decode, encode, Header, Validation};
-#[cfg(feature = "use_pem")]
-use time::OffsetDateTime;
-use wasm_bindgen_test::wasm_bindgen_test;
 
 #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
 pub struct Claims {