Skip to content

Commit 53e94cd

Browse files
authored
Remove needless borrows (#218)
clippy nightly fixed these automatically: cargo +nightly clippy -Z unstable-options --tests --fix --
1 parent e991c2e commit 53e94cd

File tree

5 files changed

+43
-43
lines changed

5 files changed

+43
-43
lines changed

src/jwa.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ impl SignatureAlgorithm {
407407
verification_algorithm,
408408
public_key.as_slice(),
409409
);
410-
public_key.verify(&data, &expected_signature)?;
410+
public_key.verify(data, expected_signature)?;
411411
Ok(())
412412
}
413413
Secret::RsaKeyPair(ref keypair) => {
@@ -424,7 +424,7 @@ impl SignatureAlgorithm {
424424

425425
let public_key =
426426
signature::UnparsedPublicKey::new(verification_algorithm, keypair.public_key());
427-
public_key.verify(&data, &expected_signature)?;
427+
public_key.verify(data, expected_signature)?;
428428
Ok(())
429429
}
430430
Secret::RSAModulusExponent { ref n, ref e } => {
@@ -444,7 +444,7 @@ impl SignatureAlgorithm {
444444
n: n_big_endian,
445445
e: e_big_endian,
446446
};
447-
public_key.verify(params, &data, &expected_signature)?;
447+
public_key.verify(params, data, expected_signature)?;
448448
Ok(())
449449
}
450450
Secret::EcdsaKeyPair(ref keypair) => {
@@ -458,7 +458,7 @@ impl SignatureAlgorithm {
458458

459459
let public_key =
460460
signature::UnparsedPublicKey::new(verification_algorithm, keypair.public_key());
461-
public_key.verify(&data, &expected_signature)?;
461+
public_key.verify(data, expected_signature)?;
462462
Ok(())
463463
}
464464
_ => unreachable!("This is a private method and should not be called erroneously."),

src/jwe.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -693,15 +693,15 @@ mod tests {
693693
&Test {
694694
test: CompressionAlgorithm::Deflate,
695695
},
696-
Some(&test_json),
696+
Some(test_json),
697697
);
698698

699699
let test_json = r#"{"test": "xxx"}"#;
700700
assert_serde_json(
701701
&Test {
702702
test: CompressionAlgorithm::Other("xxx".to_string()),
703703
},
704-
Some(&test_json),
704+
Some(test_json),
705705
);
706706
}
707707

@@ -745,23 +745,23 @@ mod tests {
745745
..Default::default()
746746
});
747747
let test_json = r#"{"alg":"RSA-OAEP","enc":"A256GCM"}"#;
748-
assert_serde_json(&test_value, Some(&test_json));
748+
assert_serde_json(&test_value, Some(test_json));
749749

750750
let test_value: Header<Empty> = From::from(RegisteredHeader {
751751
cek_algorithm: KeyManagementAlgorithm::RSA1_5,
752752
enc_algorithm: ContentEncryptionAlgorithm::A128CBC_HS256,
753753
..Default::default()
754754
});
755755
let test_json = r#"{"alg":"RSA1_5","enc":"A128CBC-HS256"}"#;
756-
assert_serde_json(&test_value, Some(&test_json));
756+
assert_serde_json(&test_value, Some(test_json));
757757

758758
let test_value: Header<Empty> = From::from(RegisteredHeader {
759759
cek_algorithm: KeyManagementAlgorithm::A128KW,
760760
enc_algorithm: ContentEncryptionAlgorithm::A128CBC_HS256,
761761
..Default::default()
762762
});
763763
let test_json = r#"{"alg":"A128KW","enc":"A128CBC-HS256"}"#;
764-
assert_serde_json(&test_value, Some(&test_json));
764+
assert_serde_json(&test_value, Some(test_json));
765765
}
766766

767767
#[test]
@@ -783,7 +783,7 @@ mod tests {
783783
},
784784
};
785785
let test_json = r#"{"alg":"RSA-OAEP","enc":"A256GCM","something":"foobar"}"#;
786-
assert_serde_json(&test_value, Some(&test_json));
786+
assert_serde_json(&test_value, Some(test_json));
787787
}
788788

789789
#[test]

src/jwk.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -757,23 +757,23 @@ mod tests {
757757
&Test {
758758
test: PublicKeyUse::Encryption,
759759
},
760-
Some(&test_json),
760+
Some(test_json),
761761
);
762762

763763
let test_json = r#"{"test": "sig"}"#;
764764
assert_serde_json(
765765
&Test {
766766
test: PublicKeyUse::Signature,
767767
},
768-
Some(&test_json),
768+
Some(test_json),
769769
);
770770

771771
let test_json = r#"{"test": "xxx"}"#;
772772
assert_serde_json(
773773
&Test {
774774
test: PublicKeyUse::Other("xxx".to_string()),
775775
},
776-
Some(&test_json),
776+
Some(test_json),
777777
);
778778
}
779779

@@ -941,71 +941,71 @@ mod tests {
941941
&Test {
942942
test: KeyOperations::Sign,
943943
},
944-
Some(&test_json),
944+
Some(test_json),
945945
);
946946

947947
let test_json = r#"{"test": "verify"}"#;
948948
assert_serde_json(
949949
&Test {
950950
test: KeyOperations::Verify,
951951
},
952-
Some(&test_json),
952+
Some(test_json),
953953
);
954954

955955
let test_json = r#"{"test": "encrypt"}"#;
956956
assert_serde_json(
957957
&Test {
958958
test: KeyOperations::Encrypt,
959959
},
960-
Some(&test_json),
960+
Some(test_json),
961961
);
962962

963963
let test_json = r#"{"test": "decrypt"}"#;
964964
assert_serde_json(
965965
&Test {
966966
test: KeyOperations::Decrypt,
967967
},
968-
Some(&test_json),
968+
Some(test_json),
969969
);
970970

971971
let test_json = r#"{"test": "wrapKey"}"#;
972972
assert_serde_json(
973973
&Test {
974974
test: KeyOperations::WrapKey,
975975
},
976-
Some(&test_json),
976+
Some(test_json),
977977
);
978978

979979
let test_json = r#"{"test": "unwrapKey"}"#;
980980
assert_serde_json(
981981
&Test {
982982
test: KeyOperations::UnwrapKey,
983983
},
984-
Some(&test_json),
984+
Some(test_json),
985985
);
986986

987987
let test_json = r#"{"test": "deriveKey"}"#;
988988
assert_serde_json(
989989
&Test {
990990
test: KeyOperations::DeriveKey,
991991
},
992-
Some(&test_json),
992+
Some(test_json),
993993
);
994994

995995
let test_json = r#"{"test": "deriveBits"}"#;
996996
assert_serde_json(
997997
&Test {
998998
test: KeyOperations::DeriveBits,
999999
},
1000-
Some(&test_json),
1000+
Some(test_json),
10011001
);
10021002

10031003
let test_json = r#"{"test": "xxx"}"#;
10041004
assert_serde_json(
10051005
&Test {
10061006
test: KeyOperations::Other("xxx".to_string()),
10071007
},
1008-
Some(&test_json),
1008+
Some(test_json),
10091009
);
10101010
}
10111011

@@ -1040,7 +1040,7 @@ mod tests {
10401040
"y": "x_FEzRu9m36HLN_tue659LNpXW6pCyStikYjKIWI5a0"
10411041
}"#;
10421042

1043-
assert_serde_json(&test_value, Some(&expected_json));
1043+
assert_serde_json(&test_value, Some(expected_json));
10441044
}
10451045

10461046
/// rfc8037#appendix-A.1
@@ -1071,7 +1071,7 @@ mod tests {
10711071
"d": "nWGxne_9WmC6hEr0kuwsxERJxWl7MmkZcDusAxyuf2A"
10721072
}"#;
10731073

1074-
assert_serde_json(&test_value, Some(&expected_json));
1074+
assert_serde_json(&test_value, Some(expected_json));
10751075
}
10761076

10771077
/// rfc8037#appendix-A.2
@@ -1097,7 +1097,7 @@ mod tests {
10971097
"x": "11qYAYKxCrfVS_7TyWQHOg7hcvPapiMlrwIaaPcHURo"
10981098
}"#;
10991099

1100-
assert_serde_json(&test_value, Some(&expected_json));
1100+
assert_serde_json(&test_value, Some(expected_json));
11011101
}
11021102

11031103
#[test]
@@ -1152,7 +1152,7 @@ mod tests {
11521152
]
11531153
}"#;
11541154

1155-
assert_serde_json(&test_value, Some(&expected_json));
1155+
assert_serde_json(&test_value, Some(expected_json));
11561156
}
11571157

11581158
/// Example public key set
@@ -1214,7 +1214,7 @@ mod tests {
12141214
};
12151215

12161216
let expected_json = include_str!("../test/fixtures/jwk_public_key.json");
1217-
assert_serde_json(&test_value, Some(&expected_json));
1217+
assert_serde_json(&test_value, Some(expected_json));
12181218
}
12191219

12201220
/// Example private key set
@@ -1330,7 +1330,7 @@ mod tests {
13301330
};
13311331

13321332
let expected_json = include_str!("../test/fixtures/jwk_private_key.json");
1333-
assert_serde_json(&test_value, Some(&expected_json));
1333+
assert_serde_json(&test_value, Some(expected_json));
13341334
}
13351335

13361336
fn find_key_set() -> JWKSet<Empty> {

src/jws/compact.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ mod tests {
685685
);
686686

687687
let jwks: JWKSet<Empty> = serde_json::from_str(
688-
&r#"{
688+
r#"{
689689
"keys": [
690690
{
691691
"kty": "oct",
@@ -712,7 +712,7 @@ mod tests {
712712
);
713713

714714
let jwks: JWKSet<Empty> = serde_json::from_str(
715-
&r#"{
715+
r#"{
716716
"keys": [
717717
{
718718
"kty": "oct",
@@ -742,7 +742,7 @@ mod tests {
742742
);
743743

744744
let jwks: JWKSet<Empty> = serde_json::from_str(
745-
&r#"{
745+
r#"{
746746
"keys": [
747747
{
748748
"kty": "oct",
@@ -771,7 +771,7 @@ mod tests {
771771
);
772772

773773
let jwks: JWKSet<Empty> = serde_json::from_str(
774-
&r#"{
774+
r#"{
775775
"keys": [
776776
{
777777
"kty": "oct",
@@ -800,7 +800,7 @@ mod tests {
800800
);
801801

802802
let jwks: JWKSet<Empty> = serde_json::from_str(
803-
&r#"{
803+
r#"{
804804
"keys": [
805805
{
806806
"kty": "oct",
@@ -829,7 +829,7 @@ mod tests {
829829
);
830830

831831
let jwks: JWKSet<Empty> = serde_json::from_str(
832-
&r#"{
832+
r#"{
833833
"keys": [
834834
{
835835
"kty": "oct",
@@ -858,7 +858,7 @@ mod tests {
858858
);
859859

860860
let jwks: JWKSet<Empty> = serde_json::from_str(
861-
&r#"{
861+
r#"{
862862
"keys": [
863863
{
864864
"kty": "RSA",
@@ -885,7 +885,7 @@ mod tests {
885885
);
886886

887887
let jwks: JWKSet<Empty> = serde_json::from_str(
888-
&r#"{
888+
r#"{
889889
"keys": [
890890
{
891891
"kty": "oct",
@@ -912,7 +912,7 @@ mod tests {
912912
);
913913

914914
let jwks: JWKSet<Empty> = serde_json::from_str(
915-
&r#"{
915+
r#"{
916916
"keys": [
917917
{
918918
"kty": "oct",
@@ -939,7 +939,7 @@ mod tests {
939939
);
940940

941941
let jwks: JWKSet<Empty> = serde_json::from_str(
942-
&r#"{
942+
r#"{
943943
"keys": [
944944
{
945945
"kty": "oct",
@@ -966,7 +966,7 @@ mod tests {
966966
);
967967

968968
let jwks: JWKSet<Empty> = serde_json::from_str(
969-
&r#"{
969+
r#"{
970970
"keys": [
971971
{
972972
"kty": "oct",
@@ -993,7 +993,7 @@ mod tests {
993993
);
994994

995995
let jwks: JWKSet<Empty> = serde_json::from_str(
996-
&r#"{
996+
r#"{
997997
"keys": [
998998
{
999999
"kty": "oct",
@@ -1020,7 +1020,7 @@ mod tests {
10201020
);
10211021

10221022
let jwks: JWKSet<Empty> = serde_json::from_str(
1023-
&r#"{
1023+
r#"{
10241024
"keys": [
10251025
{
10261026
"kty": "EC",
@@ -1080,7 +1080,7 @@ mod tests {
10801080
#[test]
10811081
fn signature_is_returned_correctly() {
10821082
let encoded_token: Compact<ClaimsSet<PrivateClaims>, Empty> =
1083-
Compact::new_encoded(&HS256_PAYLOAD);
1083+
Compact::new_encoded(HS256_PAYLOAD);
10841084
let expected_signature = data_encoding::BASE64URL_NOPAD
10851085
.decode(b"VFCl2un1Kc17odzOe2Ehf4DVrWddu3U4Ux3GFpOZHtc")
10861086
.expect("to not error");

src/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ where
2323
let deserialized: T = not_err!(serde_json::from_str(&serialized));
2424
assert_eq!(value, &deserialized);
2525

26-
if let Some(ref expected_json) = expected_json {
26+
if let Some(expected_json) = expected_json {
2727
let deserialized: T = not_err!(serde_json::from_str(expected_json));
2828
assert_eq!(value, &deserialized);
2929
}

0 commit comments

Comments
 (0)