Fix CI (#322)

* Update docs and tests for MSRV 1.67

As of #303

* Address all clippy issues

* Apply `cargo fmt`

Author: DavidS

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
         include:
         - build: pinned
           os: ubuntu-20.04
-          rust: 1.59.0
+          rust: 1.67.0
         - build: stable
           os: ubuntu-20.04
           rust: stable

Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/Keats/jsonwebtoken"
 keywords = ["jwt", "api", "token", "jwk"]
 edition = "2021"
 include = ["src/**/*", "benches/**/*", "tests/**/*", "LICENSE", "README.md", "CHANGELOG.md"]
-rust-version = "1.56.0"
+rust-version = "1.67.0"
 
 [dependencies]
 serde_json = "1.0"

README.md

@@ -14,7 +14,7 @@ jsonwebtoken = "8"
 serde = {version = "1.0", features = ["derive"] }
 ```
 
-The minimum required Rust version is 1.56.
+The minimum required Rust version (MSRV) is 1.67.
 
 ## Algorithms
 This library currently supports the following:

src/algorithms.rs

@@ -12,9 +12,10 @@ pub(crate) enum AlgorithmFamily {
 
 /// The algorithms supported for signing/verifying JWTs
 #[allow(clippy::upper_case_acronyms)]
-#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone, Serialize, Deserialize)]
+#[derive(Debug, Default, PartialEq, Eq, Hash, Copy, Clone, Serialize, Deserialize)]
 pub enum Algorithm {
     /// HMAC using SHA-256
+    #[default]
     HS256,
     /// HMAC using SHA-384
     HS384,
@@ -44,12 +45,6 @@ pub enum Algorithm {
     EdDSA,
 }
 
-impl Default for Algorithm {
-    fn default() -> Self {
-        Algorithm::HS256
-    }
-}
-
 impl FromStr for Algorithm {
     type Err = Error;
     fn from_str(s: &str) -> Result<Self> {

src/jwk.rs

@@ -1,9 +1,8 @@
 #![allow(missing_docs)]
-///! This crate contains types only for working JWK and JWK Sets
-///! This is only meant to be used to deal with public JWK, not generate ones.
-///! 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.
-///!
+//! This crate contains types only for working JWK and JWK Sets
+//! This is only meant to be used to deal with public JWK, not generate ones.
+//! 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 crate::Algorithm;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::fmt;
@@ -194,24 +193,20 @@ pub struct CommonParameters {
 
 /// Key type value for an Elliptic Curve Key.
 /// This single value enum is a workaround for Rust not supporting associated constants.
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize, Hash)]
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, Serialize, Deserialize, Hash)]
 pub enum EllipticCurveKeyType {
     /// Key type value for an Elliptic Curve Key.
+    #[default]
     EC,
 }
 
-impl Default for EllipticCurveKeyType {
-    fn default() -> Self {
-        EllipticCurveKeyType::EC
-    }
-}
-
 /// Type of cryptographic curve used by a key. This is defined in
 /// [RFC 7518 #7.6](https://tools.ietf.org/html/rfc7518#section-7.6)
-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Hash)]
+#[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize, Hash)]
 pub enum EllipticCurve {
     /// P-256 curve
     #[serde(rename = "P-256")]
+    #[default]
     P256,
     /// P-384 curve
     #[serde(rename = "P-384")]
@@ -224,12 +219,6 @@ pub enum EllipticCurve {
     Ed25519,
 }
 
-impl Default for EllipticCurve {
-    fn default() -> Self {
-        EllipticCurve::P256
-    }
-}
-
 /// Parameters for an Elliptic Curve Key
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Default, Hash)]
 pub struct EllipticCurveKeyParameters {
@@ -250,18 +239,13 @@ pub struct EllipticCurveKeyParameters {
 
 /// Key type value for an RSA Key.
 /// This single value enum is a workaround for Rust not supporting associated constants.
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize, Hash)]
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, Serialize, Deserialize, Hash)]
 pub enum RSAKeyType {
     /// Key type value for an RSA Key.
+    #[default]
     RSA,
 }
 
-impl Default for RSAKeyType {
-    fn default() -> Self {
-        RSAKeyType::RSA
-    }
-}
-
 /// Parameters for a RSA Key
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Default, Hash)]
 pub struct RSAKeyParameters {
@@ -280,19 +264,14 @@ pub struct RSAKeyParameters {
 
 /// Key type value for an Octet symmetric key.
 /// This single value enum is a workaround for Rust not supporting associated constants.
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize, Hash)]
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, Serialize, Deserialize, Hash)]
 pub enum OctetKeyType {
     /// Key type value for an Octet symmetric key.
     #[serde(rename = "oct")]
+    #[default]
     Octet,
 }
 
-impl Default for OctetKeyType {
-    fn default() -> Self {
-        OctetKeyType::Octet
-    }
-}
-
 /// Parameters for an Octet Key
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Default, Hash)]
 pub struct OctetKeyParameters {
@@ -306,19 +285,14 @@ pub struct OctetKeyParameters {
 
 /// Key type value for an Octet Key Pair.
 /// This single value enum is a workaround for Rust not supporting associated constants.
-#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize, Hash)]
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, Serialize, Deserialize, Hash)]
 pub enum OctetKeyPairType {
     /// Key type value for an Octet Key Pair.
     #[serde(rename = "OKP")]
+    #[default]
     OctetKeyPair,
 }
 
-impl Default for OctetKeyPairType {
-    fn default() -> Self {
-        OctetKeyPairType::OctetKeyPair
-    }
-}
-
 /// Parameters for an Octet Key Pair
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Default, Hash)]
 pub struct OctetKeyPairParameters {

src/pem/decoder.rs

@@ -58,7 +58,7 @@ impl PemEncodedKey {
                     Err(_) => return Err(ErrorKind::InvalidKeyFormat.into()),
                 };
 
-                match content.tag().as_ref() {
+                match content.tag() {
                     // This handles a PKCS#1 RSA Private key
                     "RSA PRIVATE KEY" => Ok(PemEncodedKey {
                         content: content.into_contents(),

src/validation.rs

@@ -228,7 +228,7 @@ pub(crate) fn validate(claims: ClaimsForValidation, options: &Validation) -> Res
         }
     }
 
-    if (options.validate_exp || options.validate_nbf) {
+    if options.validate_exp || options.validate_nbf {
         let now = get_current_timestamp();
 
         if matches!(claims.exp, TryParse::Parsed(exp) if options.validate_exp && exp < now - options.leeway)