Skip to content

Commit be8697a

Browse files
style: use non-reference patterns instead of explicit ref in patterns (#283)
1 parent 968a10a commit be8697a

File tree

4 files changed

+23
-27
lines changed

4 files changed

+23
-27
lines changed

examples/auth0.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
1818
None => return Err("Token doesn't have a `kid` header field".into()),
1919
};
2020
if let Some(j) = jwks.find(&kid) {
21-
match j.algorithm {
22-
AlgorithmParameters::RSA(ref rsa) => {
21+
match &j.algorithm {
22+
AlgorithmParameters::RSA(rsa) => {
2323
let decoding_key = DecodingKey::from_rsa_components(&rsa.n, &rsa.e).unwrap();
2424
let mut validation = Validation::new(j.common.algorithm.unwrap());
2525
validation.validate_exp = false;

src/decoding.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,19 +166,15 @@ impl DecodingKey {
166166

167167
/// If you have a key in Jwk format
168168
pub fn from_jwk(jwk: &Jwk) -> Result<Self> {
169-
match jwk.algorithm {
170-
AlgorithmParameters::RSA(ref params) => {
169+
match &jwk.algorithm {
170+
AlgorithmParameters::RSA(params) => {
171171
DecodingKey::from_rsa_components(&params.n, &params.e)
172172
}
173-
AlgorithmParameters::EllipticCurve(ref params) => {
173+
AlgorithmParameters::EllipticCurve(params) => {
174174
DecodingKey::from_ec_components(&params.x, &params.y)
175175
}
176-
AlgorithmParameters::OctetKeyPair(ref params) => {
177-
DecodingKey::from_ed_components(&params.x)
178-
}
179-
AlgorithmParameters::OctetKey(ref params) => {
180-
DecodingKey::from_base64_secret(&params.value)
181-
}
176+
AlgorithmParameters::OctetKeyPair(params) => DecodingKey::from_ed_components(&params.x),
177+
AlgorithmParameters::OctetKey(params) => DecodingKey::from_base64_secret(&params.value),
182178
}
183179
}
184180

src/errors.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pub enum ErrorKind {
8282

8383
impl StdError for Error {
8484
fn cause(&self) -> Option<&dyn StdError> {
85-
match *self.0 {
85+
match &*self.0 {
8686
ErrorKind::InvalidToken => None,
8787
ErrorKind::InvalidSignature => None,
8888
ErrorKind::InvalidEcdsaKey => None,
@@ -98,17 +98,17 @@ impl StdError for Error {
9898
ErrorKind::InvalidAlgorithm => None,
9999
ErrorKind::InvalidAlgorithmName => None,
100100
ErrorKind::InvalidKeyFormat => None,
101-
ErrorKind::Base64(ref err) => Some(err),
102-
ErrorKind::Json(ref err) => Some(err.as_ref()),
103-
ErrorKind::Utf8(ref err) => Some(err),
104-
ErrorKind::Crypto(ref err) => Some(err),
101+
ErrorKind::Base64(err) => Some(err),
102+
ErrorKind::Json(err) => Some(err.as_ref()),
103+
ErrorKind::Utf8(err) => Some(err),
104+
ErrorKind::Crypto(err) => Some(err),
105105
}
106106
}
107107
}
108108

109109
impl fmt::Display for Error {
110110
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
111-
match *self.0 {
111+
match &*self.0 {
112112
ErrorKind::InvalidToken
113113
| ErrorKind::InvalidSignature
114114
| ErrorKind::InvalidEcdsaKey
@@ -122,12 +122,12 @@ impl fmt::Display for Error {
122122
| ErrorKind::InvalidAlgorithm
123123
| ErrorKind::InvalidKeyFormat
124124
| ErrorKind::InvalidAlgorithmName => write!(f, "{:?}", self.0),
125-
ErrorKind::MissingRequiredClaim(ref c) => write!(f, "Missing required claim: {}", c),
126-
ErrorKind::InvalidRsaKey(ref msg) => write!(f, "RSA key invalid: {}", msg),
127-
ErrorKind::Json(ref err) => write!(f, "JSON error: {}", err),
128-
ErrorKind::Utf8(ref err) => write!(f, "UTF-8 error: {}", err),
129-
ErrorKind::Crypto(ref err) => write!(f, "Crypto error: {}", err),
130-
ErrorKind::Base64(ref err) => write!(f, "Base64 error: {}", err),
125+
ErrorKind::MissingRequiredClaim(c) => write!(f, "Missing required claim: {}", c),
126+
ErrorKind::InvalidRsaKey(msg) => write!(f, "RSA key invalid: {}", msg),
127+
ErrorKind::Json(err) => write!(f, "JSON error: {}", err),
128+
ErrorKind::Utf8(err) => write!(f, "UTF-8 error: {}", err),
129+
ErrorKind::Crypto(err) => write!(f, "Crypto error: {}", err),
130+
ErrorKind::Base64(err) => write!(f, "Base64 error: {}", err),
131131
}
132132
}
133133
}

src/jwk.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ impl Serialize for PublicKeyUse {
2424
where
2525
S: Serializer,
2626
{
27-
let string = match *self {
27+
let string = match self {
2828
PublicKeyUse::Signature => "sig",
2929
PublicKeyUse::Encryption => "enc",
30-
PublicKeyUse::Other(ref other) => other,
30+
PublicKeyUse::Other(other) => other,
3131
};
3232

3333
serializer.serialize_str(string)
@@ -91,7 +91,7 @@ impl Serialize for KeyOperations {
9191
where
9292
S: Serializer,
9393
{
94-
let string = match *self {
94+
let string = match self {
9595
KeyOperations::Sign => "sign",
9696
KeyOperations::Verify => "verify",
9797
KeyOperations::Encrypt => "encrypt",
@@ -100,7 +100,7 @@ impl Serialize for KeyOperations {
100100
KeyOperations::UnwrapKey => "unwrapKey",
101101
KeyOperations::DeriveKey => "deriveKey",
102102
KeyOperations::DeriveBits => "deriveBits",
103-
KeyOperations::Other(ref other) => other,
103+
KeyOperations::Other(other) => other,
104104
};
105105

106106
serializer.serialize_str(string)

0 commit comments

Comments
 (0)