Skip to content

Commit 501fdc9

Browse files
dishmakerdishmaker
authored
all: apply nightly clippy fixes (2025-05-01) (#1806)
1 parent ae26520 commit 501fdc9

File tree

43 files changed

+178
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+178
-191
lines changed

‎base16ct/src/display.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub struct HexDisplay<'a>(pub &'a [u8]);
66

77
impl fmt::Display for HexDisplay<'_> {
88
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
9-
write!(f, "{:X}", self)
9+
write!(f, "{self:X}")
1010
}
1111
}
1212

‎cmpv2/tests/cert_req.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn cr_req_message_test() {
2222
// - openssl cmp -cmd cr -server 127.0.0.1:8888 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -newkey ec384-key-pair.pem -subject "/CN=MyName" -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout cr_req_01.bin -rspout cr_rsp_01.bin
2323
let req_01 = include_bytes!("examples/cr_req_01.bin");
2424
let result = PkiMessage::from_der(req_01);
25-
println!("{:?}", result);
25+
println!("{result:?}");
2626
assert!(result.is_ok());
2727
let message = result.unwrap();
2828

@@ -100,8 +100,8 @@ fn cr_req_message_test() {
100100
);
101101

102102
let reencoded_req_01 = message.to_der().unwrap();
103-
println!("Original : {:02X?}", req_01);
104-
println!("Reencoded: {:02X?}", reencoded_req_01);
103+
println!("Original : {req_01:02X?}");
104+
println!("Reencoded: {reencoded_req_01:02X?}");
105105
assert_eq!(req_01, reencoded_req_01.as_slice());
106106
}
107107

@@ -119,7 +119,7 @@ fn cr_rsp_message_test() {
119119
// - openssl cmp -cmd cr -server 127.0.0.1:8888 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -newkey ec384-key-pair.pem -subject "/CN=MyName" -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout cr_req_01.bin -rspout cr_rsp_01.bin
120120
let req_01 = include_bytes!("examples/cr_rsp_01.bin");
121121
let result = PkiMessage::from_der(req_01);
122-
println!("{:?}", result);
122+
println!("{result:?}");
123123
assert!(result.is_ok());
124124
let message = result.unwrap();
125125

@@ -175,7 +175,7 @@ fn cr_rsp_message_test() {
175175
assert_eq!(105u32, protection.encoded_len().unwrap().into());
176176

177177
let reencoded_req_01 = message.to_der().unwrap();
178-
println!("Original : {:02X?}", req_01);
179-
println!("Reencoded: {:02X?}", reencoded_req_01);
178+
println!("Original : {req_01:02X?}");
179+
println!("Reencoded: {reencoded_req_01:02X?}");
180180
assert_eq!(req_01, reencoded_req_01.as_slice());
181181
}

‎cmpv2/tests/genm_req.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ fn genm_req_header_test() {
1313
assert_eq!(header.pvno, Pvno::Cmp2000);
1414

1515
let reencoded_header_01 = header.to_der().unwrap();
16-
println!("Original : {:02X?}", header_01);
17-
println!("Reencoded: {:02X?}", reencoded_header_01);
16+
println!("Original : {header_01:02X?}");
17+
println!("Reencoded: {reencoded_header_01:02X?}");
1818
assert_eq!(header_01, reencoded_header_01.as_slice());
1919
}
2020

2121
#[test]
2222
fn genm_req_body_test() {
2323
// read PkiBody cracked from request object used in genm_req_message_test
2424
let body_01 = include_bytes!("examples/genm_req_body_01.bin");
25-
println!("Original : {:02X?}", body_01);
25+
println!("Original : {body_01:02X?}");
2626
let result = PkiBody::from_der(body_01);
27-
println!("{:?}", result);
27+
println!("{result:?}");
2828
assert!(result.is_ok());
2929
let body = result.unwrap();
3030

3131
let reencoded_body_01 = body.to_der().unwrap();
32-
println!("Original : {:02X?}", body_01);
33-
println!("Reencoded: {:02X?}", reencoded_body_01);
32+
println!("Original : {body_01:02X?}");
33+
println!("Reencoded: {reencoded_body_01:02X?}");
3434
assert_eq!(body_01, reencoded_body_01.as_slice());
3535
}
3636

@@ -48,13 +48,13 @@ fn genm_req_message_test() {
4848
// - openssl cmp -cmd genm -server 127.0.0.1:8080 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -geninfo 1.2.3.4:int:56789 -infotype signKeyPairTypes -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout genm_req_01.bin -rspout genm_rsp_01.bin
4949
let req_01 = include_bytes!("examples/genm_req_01.bin");
5050
let result = PkiMessage::from_der(req_01);
51-
println!("{:?}", result);
51+
println!("{result:?}");
5252
assert!(result.is_ok());
5353
let message = result.unwrap();
5454

5555
let reencoded_req_01 = message.to_der().unwrap();
56-
println!("Original : {:02X?}", req_01);
57-
println!("Reencoded: {:02X?}", reencoded_req_01);
56+
println!("Original : {req_01:02X?}");
57+
println!("Reencoded: {reencoded_req_01:02X?}");
5858
assert_eq!(req_01, reencoded_req_01.as_slice());
5959
}
6060

@@ -72,12 +72,12 @@ fn genm_rsp_message_test() {
7272
// - openssl cmp -cmd genm -server 127.0.0.1:8080 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -geninfo 1.2.3.4:int:56789 -infotype signKeyPairTypes -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout genm_req_01.bin -rspout genm_rsp_01.bin
7373
let req_01 = include_bytes!("examples/genm_rsp_01.bin");
7474
let result = PkiMessage::from_der(req_01);
75-
println!("{:?}", result);
75+
println!("{result:?}");
7676
assert!(result.is_ok());
7777
let message = result.unwrap();
7878

7979
let reencoded_req_01 = message.to_der().unwrap();
80-
println!("Original : {:02X?}", req_01);
81-
println!("Reencoded: {:02X?}", reencoded_req_01);
80+
println!("Original : {req_01:02X?}");
81+
println!("Reencoded: {reencoded_req_01:02X?}");
8282
assert_eq!(req_01, reencoded_req_01.as_slice());
8383
}

‎cmpv2/tests/init_req.rs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ fn ir_req_header_test() {
2020
assert_eq!(header.pvno, Pvno::Cmp2000);
2121

2222
let reencoded_header_01 = header.to_der().unwrap();
23-
println!("Original : {:02X?}", header_01);
24-
println!("Reencoded: {:02X?}", reencoded_header_01);
23+
println!("Original : {header_01:02X?}");
24+
println!("Reencoded: {reencoded_header_01:02X?}");
2525
assert_eq!(header_01, reencoded_header_01.as_slice());
2626
}
2727

@@ -30,13 +30,13 @@ fn ir_req_body_test() {
3030
// read PkiBody cracked from request object used in ir_req_message_test
3131
let body_01 = include_bytes!("examples/ir_req_body_01.bin");
3232
let result = PkiBody::from_der(body_01);
33-
println!("{:?}", result);
33+
println!("{result:?}");
3434
assert!(result.is_ok());
3535
let body = result.unwrap();
3636

3737
let reencoded_body_01 = body.to_der().unwrap();
38-
println!("Original : {:02X?}", body_01);
39-
println!("Reencoded: {:02X?}", reencoded_body_01);
38+
println!("Original : {body_01:02X?}");
39+
println!("Reencoded: {reencoded_body_01:02X?}");
4040
assert_eq!(body_01, reencoded_body_01.as_slice());
4141
}
4242

@@ -54,7 +54,7 @@ fn ir_req_message_test() {
5454
// - openssl cmp -cmd ir -server 127.0.0.1:8888 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -newkey ec384-key-pair.pem -subject "/CN=MyName" -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout req.bin -rspout rsp.bin
5555
let req_01 = include_bytes!("examples/ir_req_01.bin");
5656
let result = PkiMessage::from_der(req_01);
57-
println!("{:?}", result);
57+
println!("{result:?}");
5858
assert!(result.is_ok());
5959
let message = result.unwrap();
6060

@@ -132,8 +132,8 @@ fn ir_req_message_test() {
132132
);
133133

134134
let reencoded_req_01 = message.to_der().unwrap();
135-
println!("Original : {:02X?}", req_01);
136-
println!("Reencoded: {:02X?}", reencoded_req_01);
135+
println!("Original : {req_01:02X?}");
136+
println!("Reencoded: {reencoded_req_01:02X?}");
137137
assert_eq!(req_01, reencoded_req_01.as_slice());
138138
}
139139

@@ -147,8 +147,8 @@ fn ir_rsp_header_test() {
147147
assert_eq!(header.pvno, Pvno::Cmp2000);
148148

149149
let reencoded_header_01 = header.to_der().unwrap();
150-
println!("Original : {:02X?}", header_01);
151-
println!("Reencoded: {:02X?}", reencoded_header_01);
150+
println!("Original : {header_01:02X?}");
151+
println!("Reencoded: {reencoded_header_01:02X?}");
152152
assert_eq!(header_01, reencoded_header_01.as_slice());
153153
}
154154

@@ -157,13 +157,13 @@ fn ir_rsp_body_test() {
157157
// read PkiBody cracked from request object used in ir_rsp_message_test
158158
let body_01 = &hex!("A10E300C300A30080201003003020100");
159159
let result = PkiBody::from_der(body_01);
160-
println!("{:?}", result);
160+
println!("{result:?}");
161161
assert!(result.is_ok());
162162
let body = result.unwrap();
163163

164164
let reencoded_body_01 = body.to_der().unwrap();
165-
println!("Original : {:02X?}", body_01);
166-
println!("Reencoded: {:02X?}", reencoded_body_01);
165+
println!("Original : {body_01:02X?}");
166+
println!("Reencoded: {reencoded_body_01:02X?}");
167167
assert_eq!(body_01, reencoded_body_01.as_slice());
168168
}
169169

@@ -172,13 +172,13 @@ fn ir_certrepmessage_test() {
172172
// read CertRepMessage cracked from request object used in ir_rsp_message_test
173173
let orig_cert_response = &hex!("300C300A30080201003003020100");
174174
let result = CertRepMessage::from_der(orig_cert_response);
175-
println!("{:?}", result);
175+
println!("{result:?}");
176176
assert!(result.is_ok());
177177
let cert_response = result.unwrap();
178178

179179
let reencoded_cert_response = cert_response.to_der().unwrap();
180-
println!("Original : {:02X?}", orig_cert_response);
181-
println!("Reencoded: {:02X?}", reencoded_cert_response);
180+
println!("Original : {orig_cert_response:02X?}");
181+
println!("Reencoded: {reencoded_cert_response:02X?}");
182182
assert_eq!(orig_cert_response, reencoded_cert_response.as_slice());
183183
}
184184

@@ -187,13 +187,13 @@ fn ir_cert_responses_test() {
187187
// read CertResponses cracked from request object used in ir_rsp_message_test
188188
let orig_cert_responses = &hex!("300A30080201003003020100");
189189
let result = CertResponses::from_der(orig_cert_responses);
190-
println!("{:?}", result);
190+
println!("{result:?}");
191191
assert!(result.is_ok());
192192
let cert_response = result.unwrap();
193193

194194
let reencoded_cert_response = cert_response.to_der().unwrap();
195-
println!("Original : {:02X?}", orig_cert_responses);
196-
println!("Reencoded: {:02X?}", reencoded_cert_response);
195+
println!("Original : {orig_cert_responses:02X?}");
196+
println!("Reencoded: {reencoded_cert_response:02X?}");
197197
assert_eq!(orig_cert_responses, reencoded_cert_response.as_slice());
198198
}
199199

@@ -202,13 +202,13 @@ fn ir_cert_response_test() {
202202
// read CertResponse cracked from request object used in ir_rsp_message_test
203203
let orig_cert_response = &hex!("30080201003003020100");
204204
let result = CertResponse::from_der(orig_cert_response);
205-
println!("{:?}", result);
205+
println!("{result:?}");
206206
assert!(result.is_ok());
207207
let cert_response = result.unwrap();
208208

209209
let reencoded_cert_response = cert_response.to_der().unwrap();
210-
println!("Original : {:02X?}", orig_cert_response);
211-
println!("Reencoded: {:02X?}", reencoded_cert_response);
210+
println!("Original : {orig_cert_response:02X?}");
211+
println!("Reencoded: {reencoded_cert_response:02X?}");
212212
assert_eq!(orig_cert_response, reencoded_cert_response.as_slice());
213213
}
214214

@@ -226,7 +226,7 @@ fn ir_rsp_message_test() {
226226
// - openssl cmp -cmd ir -server 127.0.0.1:8888 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -newkey ec384-key-pair.pem -subject "/CN=MyName" -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout req.bin -rspout rsp.bin
227227
let req_01 = include_bytes!("examples/ir_rsp_01.bin");
228228
let result = PkiMessage::from_der(req_01);
229-
println!("{:?}", result);
229+
println!("{result:?}");
230230
assert!(result.is_ok());
231231
let message = result.unwrap();
232232

@@ -282,7 +282,7 @@ fn ir_rsp_message_test() {
282282
assert_eq!(107u32, protection.encoded_len().unwrap().into());
283283

284284
let reencoded_req_01 = message.to_der().unwrap();
285-
println!("Original : {:02X?}", req_01);
286-
println!("Reencoded: {:02X?}", reencoded_req_01);
285+
println!("Original : {req_01:02X?}");
286+
println!("Reencoded: {reencoded_req_01:02X?}");
287287
assert_eq!(req_01, reencoded_req_01.as_slice());
288288
}

‎cmpv2/tests/key_update_req.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ fn kur_req_header_test() {
1313
assert_eq!(header.pvno, Pvno::Cmp2000);
1414

1515
let reencoded_header_01 = header.to_der().unwrap();
16-
println!("Original : {:02X?}", header_01);
17-
println!("Reencoded: {:02X?}", reencoded_header_01);
16+
println!("Original : {header_01:02X?}");
17+
println!("Reencoded: {reencoded_header_01:02X?}");
1818
assert_eq!(header_01, reencoded_header_01.as_slice());
1919
}
2020

@@ -23,13 +23,13 @@ fn kur_req_body_test() {
2323
// read PkiBody cracked from request object used in kur_req_message_test
2424
let body_01 = include_bytes!("examples/kur_req_body_01.bin");
2525
let result = PkiBody::from_der(body_01);
26-
println!("{:?}", result);
26+
println!("{result:?}");
2727
assert!(result.is_ok());
2828
let body = result.unwrap();
2929

3030
let reencoded_body_01 = body.to_der().unwrap();
31-
println!("Original : {:02X?}", body_01);
32-
println!("Reencoded: {:02X?}", reencoded_body_01);
31+
println!("Original : {body_01:02X?}");
32+
println!("Reencoded: {reencoded_body_01:02X?}");
3333
assert_eq!(body_01, reencoded_body_01.as_slice());
3434
}
3535

@@ -47,13 +47,13 @@ fn kur_req_message_test() {
4747
// - openssl cmp -cmd kur -server 127.0.0.1:8888 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -newkey ec384-key-pair.pem -subject "/CN=MyName" -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout kur_req_01.bin -rspout kur_rsp_01.bin
4848
let req_01 = include_bytes!("examples/kur_req_01.bin");
4949
let result = PkiMessage::from_der(req_01);
50-
println!("{:?}", result);
50+
println!("{result:?}");
5151
assert!(result.is_ok());
5252
let message = result.unwrap();
5353

5454
let reencoded_req_01 = message.to_der().unwrap();
55-
println!("Original : {:02X?}", req_01);
56-
println!("Reencoded: {:02X?}", reencoded_req_01);
55+
println!("Original : {req_01:02X?}");
56+
println!("Reencoded: {reencoded_req_01:02X?}");
5757
assert_eq!(req_01, reencoded_req_01.as_slice());
5858
}
5959

@@ -71,13 +71,13 @@ fn kur_rsp_message_test() {
7171
// - openssl cmp -cmd kur -server 127.0.0.1:8888 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -newkey ec384-key-pair.pem -subject "/CN=MyName" -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout kur_req_01.bin -rspout kur_rsp_01.bin
7272
let req_01 = include_bytes!("examples/kur_rsp_01.bin");
7373
let result = PkiMessage::from_der(req_01);
74-
println!("{:?}", result);
74+
println!("{result:?}");
7575
assert!(result.is_ok());
7676
let message = result.unwrap();
7777

7878
let reencoded_req_01 = message.to_der().unwrap();
79-
println!("Original : {:02X?}", req_01);
80-
println!("Reencoded: {:02X?}", reencoded_req_01);
79+
println!("Original : {req_01:02X?}");
80+
println!("Reencoded: {reencoded_req_01:02X?}");
8181
assert_eq!(req_01, reencoded_req_01.as_slice());
8282
}
8383

@@ -95,12 +95,12 @@ fn failed_kur_rsp_message_test() {
9595
// - openssl cmp -cmd kur -server 127.0.0.1:8888 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -newkey ec384-key-pair.pem -subject "/CN=MyName" -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout kur_req_01.bin -rspout kur_rsp_01.bin
9696
let req_01 = include_bytes!("examples/failed_kur_rsp_01.bin");
9797
let result = PkiMessage::from_der(req_01);
98-
println!("{:?}", result);
98+
println!("{result:?}");
9999
assert!(result.is_ok());
100100
let message = result.unwrap();
101101

102102
let reencoded_req_01 = message.to_der().unwrap();
103-
println!("Original : {:02X?}", req_01);
104-
println!("Reencoded: {:02X?}", reencoded_req_01);
103+
println!("Original : {req_01:02X?}");
104+
println!("Reencoded: {reencoded_req_01:02X?}");
105105
assert_eq!(req_01, reencoded_req_01.as_slice());
106106
}

‎cmpv2/tests/p10cr_req.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn p10cr_req_message_test() {
1919
// - openssl cmp -cmd p10cr -server 127.0.0.1:8080 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -csr ec384-ee-key.csr -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout p10cr_req_01.bin -rspout p10cr_rsp_01.bin
2020
let req_01 = include_bytes!("examples/p10cr_req_01.bin");
2121
let result = PkiMessage::from_der(req_01);
22-
println!("{:?}", result);
22+
println!("{result:?}");
2323
assert!(result.is_ok());
2424
let message = result.unwrap();
2525

@@ -72,8 +72,8 @@ fn p10cr_req_message_test() {
7272
);
7373

7474
let reencoded_req_01 = message.to_der().unwrap();
75-
println!("Original : {:02X?}", req_01);
76-
println!("Reencoded: {:02X?}", reencoded_req_01);
75+
println!("Original : {req_01:02X?}");
76+
println!("Reencoded: {reencoded_req_01:02X?}");
7777
assert_eq!(req_01, reencoded_req_01.as_slice());
7878
}
7979

@@ -91,12 +91,12 @@ fn p10cr_rsp_message_test() {
9191
// - openssl cmp -cmd p10cr -server 127.0.0.1:8080 -path pkix/ -ref 1234 -secret pass:1234-5678-1234-5678 -recipient "/CN=CMPserver" -csr ec384-ee-key.csr -cacertsout capubs.pem -certout cl_cert.pem -srv_cert ec384-server-key.crt -reqout p10cr_req_01.bin -rspout p10cr_rsp_01.bin
9292
let req_01 = include_bytes!("examples/p10cr_rsp_01.bin");
9393
let result = PkiMessage::from_der(req_01);
94-
println!("{:?}", result);
94+
println!("{result:?}");
9595
assert!(result.is_ok());
9696
let message = result.unwrap();
9797

9898
let reencoded_req_01 = message.to_der().unwrap();
99-
println!("Original : {:02X?}", req_01);
100-
println!("Reencoded: {:02X?}", reencoded_req_01);
99+
println!("Original : {req_01:02X?}");
100+
println!("Reencoded: {reencoded_req_01:02X?}");
101101
assert_eq!(req_01, reencoded_req_01.as_slice());
102102
}

0 commit comments

Comments
 (0)