Skip to content

Commit 8d73e54

Browse files
adrian-kongadrian-kong
authored
new rust clippy (#1292)
1 parent f005536 commit 8d73e54

File tree

112 files changed

+1179
-1911
lines changed

Some content is hidden

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

112 files changed

+1179
-1911
lines changed

‎generator/sbpg/targets/resources/rust/test/sbp_tests_template.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::*;
1515

1616
((*- macro compare_value(prefix, value) *))
1717
((*- if value is string_type *))
18-
assert_eq!(msg.(((prefix|snake_case))).to_string(), (((value|str_escape))), "incorrect value for msg.(((prefix|snake_case))), expected string '{}', is '{}'", (((value|str_escape))), msg.(((prefix|snake_case))));
18+
assert_eq!(msg.(((prefix|snake_case))).as_bytes(), (((value|bytes_escape))), "incorrect value for msg.(((prefix|snake_case))), expected string '{:?}', is '{:?}'", (((value|bytes_escape))), msg.(((prefix|snake_case))).as_bytes());
1919
((*- elif value is array_type *))
2020
((*- for ff in value *))((( compare_value( (((prefix|snake_case))) + '[' + (((loop.index0|to_str))) + ']', (((ff))) ) )))((*- endfor *))
2121
((*- elif value is dict_type *))
@@ -52,7 +52,7 @@ fn test_(((s.suite_name|snake_case)))()
5252
sbp::messages::Sbp::(((t.msg.name|lower_acronyms)))(msg) => {
5353
assert_eq!( msg.message_type(), (((t.msg_type))), "Incorrect message type, expected (((t.msg_type))), is {}", msg.message_type());
5454
let sender_id = msg.sender_id().unwrap();
55-
assert_eq!(sender_id, (((t.sbp.sender))), "incorrect sender id, expected (((t.sbp.sender))), is {}", sender_id);
55+
assert_eq!(sender_id, (((t.sbp.sender))), "incorrect sender id, expected (((t.sbp.sender))), is {sender_id}");
5656
((*- for f in t.fieldskeys *))(((compare_value( (((f))), (((t.fields[f]))) ))))((*- endfor *))
5757
},
5858
_ => panic!("Invalid message type! Expected a (((t.msg.name)))"),
@@ -98,7 +98,7 @@ fn test_json2sbp_(((s.suite_name|snake_case)))()
9898
sbp::messages::Sbp::(((t.msg.name|lower_acronyms)))(msg) => {
9999
assert_eq!( msg.message_type(), (((t.msg_type))), "Incorrect message type, expected (((t.msg_type))), is {}", msg.message_type());
100100
let sender_id = msg.sender_id().unwrap();
101-
assert_eq!(sender_id, (((t.sbp.sender))), "incorrect sender id, expected (((t.sbp.sender))), is {}", sender_id);
101+
assert_eq!(sender_id, (((t.sbp.sender))), "incorrect sender id, expected (((t.sbp.sender))), is {sender_id}");
102102
((*- for f in t.fieldskeys *))(((compare_value( (((f))), (((t.fields[f]))) ))))((*- endfor *))
103103
},
104104
_ => panic!("Invalid message type! Expected a (((t.msg.name)))"),
@@ -141,7 +141,7 @@ fn test_sbp2json_(((s.suite_name|snake_case)))()
141141
sbp::messages::Sbp::(((t.msg.name|lower_acronyms)))(msg) => {
142142
assert_eq!( msg.message_type(), (((t.msg_type))), "Incorrect message type, expected (((t.msg_type))), is {}", msg.message_type());
143143
let sender_id = msg.sender_id().unwrap();
144-
assert_eq!(sender_id, (((t.sbp.sender))), "incorrect sender id, expected (((t.sbp.sender))), is {}", sender_id);
144+
assert_eq!(sender_id, (((t.sbp.sender))), "incorrect sender id, expected (((t.sbp.sender))), is {sender_id}");
145145
((*- for f in t.fieldskeys *))(((compare_value( (((f))), (((t.fields[f]))) ))))((*- endfor *))
146146
},
147147
_ => panic!("Invalid message type! Expected a (((t.msg.name)))"),

‎generator/sbpg/targets/test_rust.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
TEST_TEMPLATE_NAME = "rust/test/sbp_tests_template.rs"
2323
TEST_MAIN_TEMPLATE_NAME = "rust/test/sbp_tests_main_template.rs"
2424

25-
def str_escape(value):
26-
return "\"{}\"".format(value)
25+
def bytes_escape(value):
26+
return "&{}".format(list(bytes(value, "ascii")))
2727

2828
def mod_name(value):
2929
return value.split('.')[1]
3030

3131
JENV.filters['to_str'] = to_str
32-
JENV.filters['str_escape'] = str_escape
32+
JENV.filters['bytes_escape'] = bytes_escape
3333
JENV.filters['sorted'] = sorted
3434
JENV.filters['mod_name'] = mod_name
3535
JENV.filters['lower_acronyms'] = lower_acronyms

‎rust/sbp/examples/serial.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn main() {
2626
Ok(Sbp::MsgLog(x)) => println!("{}", x.text),
2727
Ok(Sbp::MsgPosLlh(x)) => println!("{} {} {}", x.lat, x.lon, x.height),
2828
Err(e) => {
29-
eprintln!("{:?}", e);
29+
eprintln!("{e:?}");
3030
break;
3131
}
3232
_ => {}

‎rust/sbp/src/sbp_string.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ impl<'de, E, const LEN: usize> serde::Deserialize<'de> for SbpString<[u8; LEN],
226226
Er: Error,
227227
{
228228
let data = v.as_bytes().try_into().map_err(|_| {
229-
Error::custom(format!("was expecting a string of length {}", LEN))
229+
Error::custom(format!("was expecting a string of length {LEN}"))
230230
})?;
231231
Ok(SbpString::new(data))
232232
}
@@ -236,7 +236,7 @@ impl<'de, E, const LEN: usize> serde::Deserialize<'de> for SbpString<[u8; LEN],
236236
Er: Error,
237237
{
238238
let data = v.into_bytes().try_into().map_err(|_| {
239-
Error::custom(format!("was expecting a string of length {}", LEN))
239+
Error::custom(format!("was expecting a string of length {LEN}"))
240240
})?;
241241
Ok(SbpString::new(data))
242242
}
@@ -246,7 +246,7 @@ impl<'de, E, const LEN: usize> serde::Deserialize<'de> for SbpString<[u8; LEN],
246246
Er: Error,
247247
{
248248
let data = v.try_into().map_err(|_| {
249-
Error::custom(format!("was expecting a string of length {}", LEN))
249+
Error::custom(format!("was expecting a string of length {LEN}"))
250250
})?;
251251
Ok(SbpString::new(data))
252252
}
@@ -256,7 +256,7 @@ impl<'de, E, const LEN: usize> serde::Deserialize<'de> for SbpString<[u8; LEN],
256256
Er: Error,
257257
{
258258
let data = v.try_into().map_err(|_| {
259-
Error::custom(format!("was expecting a string of length {}", LEN))
259+
Error::custom(format!("was expecting a string of length {LEN}"))
260260
})?;
261261
Ok(SbpString::new(data))
262262
}

‎rust/sbp/tests/integration/auto_check_sbp_acquisition_msg_acq_result_dep_a.rs‎

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ fn test_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
4343
let sender_id = msg.sender_id().unwrap();
4444
assert_eq!(
4545
sender_id, 0x4c3,
46-
"incorrect sender id, expected 0x4c3, is {}",
47-
sender_id
46+
"incorrect sender id, expected 0x4c3, is {sender_id}"
4847
);
4948
assert!(
5049
msg.cf.almost_eq(8.24194335937500000e+03),
@@ -95,8 +94,7 @@ fn test_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
9594
let sender_id = msg.sender_id().unwrap();
9695
assert_eq!(
9796
sender_id, 0x4c3,
98-
"incorrect sender id, expected 0x4c3, is {}",
99-
sender_id
97+
"incorrect sender id, expected 0x4c3, is {sender_id}"
10098
);
10199
assert!(
102100
msg.cf.almost_eq(7.49267639160156250e+02),
@@ -147,8 +145,7 @@ fn test_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
147145
let sender_id = msg.sender_id().unwrap();
148146
assert_eq!(
149147
sender_id, 0x4c3,
150-
"incorrect sender id, expected 0x4c3, is {}",
151-
sender_id
148+
"incorrect sender id, expected 0x4c3, is {sender_id}"
152149
);
153150
assert!(
154151
msg.cf.almost_eq(-6.49365283203125000e+03),
@@ -200,8 +197,7 @@ fn test_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
200197
let sender_id = msg.sender_id().unwrap();
201198
assert_eq!(
202199
sender_id, 0x4c3,
203-
"incorrect sender id, expected 0x4c3, is {}",
204-
sender_id
200+
"incorrect sender id, expected 0x4c3, is {sender_id}"
205201
);
206202
assert!(
207203
msg.cf.almost_eq(-9.99023498535156250e+02),
@@ -252,8 +248,7 @@ fn test_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
252248
let sender_id = msg.sender_id().unwrap();
253249
assert_eq!(
254250
sender_id, 0x4c3,
255-
"incorrect sender id, expected 0x4c3, is {}",
256-
sender_id
251+
"incorrect sender id, expected 0x4c3, is {sender_id}"
257252
);
258253
assert!(
259254
msg.cf.almost_eq(4.74536132812500000e+03),
@@ -304,8 +299,7 @@ fn test_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
304299
let sender_id = msg.sender_id().unwrap();
305300
assert_eq!(
306301
sender_id, 0x4c3,
307-
"incorrect sender id, expected 0x4c3, is {}",
308-
sender_id
302+
"incorrect sender id, expected 0x4c3, is {sender_id}"
309303
);
310304
assert!(
311305
msg.cf.almost_eq(-4.99511749267578125e+02),
@@ -377,8 +371,7 @@ fn test_json2sbp_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
377371
let sender_id = msg.sender_id().unwrap();
378372
assert_eq!(
379373
sender_id, 0x4c3,
380-
"incorrect sender id, expected 0x4c3, is {}",
381-
sender_id
374+
"incorrect sender id, expected 0x4c3, is {sender_id}"
382375
);
383376
assert!(
384377
msg.cf.almost_eq(8.24194335937500000e+03),
@@ -436,8 +429,7 @@ fn test_json2sbp_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
436429
let sender_id = msg.sender_id().unwrap();
437430
assert_eq!(
438431
sender_id, 0x4c3,
439-
"incorrect sender id, expected 0x4c3, is {}",
440-
sender_id
432+
"incorrect sender id, expected 0x4c3, is {sender_id}"
441433
);
442434
assert!(
443435
msg.cf.almost_eq(7.49267639160156250e+02),
@@ -495,8 +487,7 @@ fn test_json2sbp_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
495487
let sender_id = msg.sender_id().unwrap();
496488
assert_eq!(
497489
sender_id, 0x4c3,
498-
"incorrect sender id, expected 0x4c3, is {}",
499-
sender_id
490+
"incorrect sender id, expected 0x4c3, is {sender_id}"
500491
);
501492
assert!(
502493
msg.cf.almost_eq(-6.49365283203125000e+03),
@@ -554,8 +545,7 @@ fn test_json2sbp_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
554545
let sender_id = msg.sender_id().unwrap();
555546
assert_eq!(
556547
sender_id, 0x4c3,
557-
"incorrect sender id, expected 0x4c3, is {}",
558-
sender_id
548+
"incorrect sender id, expected 0x4c3, is {sender_id}"
559549
);
560550
assert!(
561551
msg.cf.almost_eq(-9.99023498535156250e+02),
@@ -613,8 +603,7 @@ fn test_json2sbp_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
613603
let sender_id = msg.sender_id().unwrap();
614604
assert_eq!(
615605
sender_id, 0x4c3,
616-
"incorrect sender id, expected 0x4c3, is {}",
617-
sender_id
606+
"incorrect sender id, expected 0x4c3, is {sender_id}"
618607
);
619608
assert!(
620609
msg.cf.almost_eq(4.74536132812500000e+03),
@@ -672,8 +661,7 @@ fn test_json2sbp_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
672661
let sender_id = msg.sender_id().unwrap();
673662
assert_eq!(
674663
sender_id, 0x4c3,
675-
"incorrect sender id, expected 0x4c3, is {}",
676-
sender_id
664+
"incorrect sender id, expected 0x4c3, is {sender_id}"
677665
);
678666
assert!(
679667
msg.cf.almost_eq(-4.99511749267578125e+02),
@@ -752,8 +740,7 @@ fn test_sbp2json_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
752740
let sender_id = msg.sender_id().unwrap();
753741
assert_eq!(
754742
sender_id, 0x4c3,
755-
"incorrect sender id, expected 0x4c3, is {}",
756-
sender_id
743+
"incorrect sender id, expected 0x4c3, is {sender_id}"
757744
);
758745
assert!(
759746
msg.cf.almost_eq(8.24194335937500000e+03),
@@ -823,8 +810,7 @@ fn test_sbp2json_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
823810
let sender_id = msg.sender_id().unwrap();
824811
assert_eq!(
825812
sender_id, 0x4c3,
826-
"incorrect sender id, expected 0x4c3, is {}",
827-
sender_id
813+
"incorrect sender id, expected 0x4c3, is {sender_id}"
828814
);
829815
assert!(
830816
msg.cf.almost_eq(7.49267639160156250e+02),
@@ -894,8 +880,7 @@ fn test_sbp2json_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
894880
let sender_id = msg.sender_id().unwrap();
895881
assert_eq!(
896882
sender_id, 0x4c3,
897-
"incorrect sender id, expected 0x4c3, is {}",
898-
sender_id
883+
"incorrect sender id, expected 0x4c3, is {sender_id}"
899884
);
900885
assert!(
901886
msg.cf.almost_eq(-6.49365283203125000e+03),
@@ -966,8 +951,7 @@ fn test_sbp2json_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
966951
let sender_id = msg.sender_id().unwrap();
967952
assert_eq!(
968953
sender_id, 0x4c3,
969-
"incorrect sender id, expected 0x4c3, is {}",
970-
sender_id
954+
"incorrect sender id, expected 0x4c3, is {sender_id}"
971955
);
972956
assert!(
973957
msg.cf.almost_eq(-9.99023498535156250e+02),
@@ -1037,8 +1021,7 @@ fn test_sbp2json_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
10371021
let sender_id = msg.sender_id().unwrap();
10381022
assert_eq!(
10391023
sender_id, 0x4c3,
1040-
"incorrect sender id, expected 0x4c3, is {}",
1041-
sender_id
1024+
"incorrect sender id, expected 0x4c3, is {sender_id}"
10421025
);
10431026
assert!(
10441027
msg.cf.almost_eq(4.74536132812500000e+03),
@@ -1108,8 +1091,7 @@ fn test_sbp2json_auto_check_sbp_acquisition_msg_acq_result_dep_a() {
11081091
let sender_id = msg.sender_id().unwrap();
11091092
assert_eq!(
11101093
sender_id, 0x4c3,
1111-
"incorrect sender id, expected 0x4c3, is {}",
1112-
sender_id
1094+
"incorrect sender id, expected 0x4c3, is {sender_id}"
11131095
);
11141096
assert!(
11151097
msg.cf.almost_eq(-4.99511749267578125e+02),

0 commit comments

Comments
 (0)