Skip to content

Commit 9049391

Browse files
volsavolsa
committed
chore: cargo fmt
1 parent 237313c commit 9049391

File tree

3 files changed

+33
-99
lines changed

3 files changed

+33
-99
lines changed

‎libs/stdlib/src/counters.rs

Lines changed: 18 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ where
5555
#[allow(non_upper_case_globals)]
5656
#[no_mangle]
5757
#[used]
58-
pub static __vtable_CTU: VTableCTU<i16> = VTableCTU {
59-
body: CTU,
60-
};
58+
pub static __vtable_CTU: VTableCTU<i16> = VTableCTU { body: CTU };
6159

6260
#[allow(non_upper_case_globals)]
6361
#[no_mangle]
@@ -84,9 +82,7 @@ pub extern "C" fn CTU(params: &mut CTUParams<i16>) {
8482
#[allow(non_upper_case_globals)]
8583
#[no_mangle]
8684
#[used]
87-
pub static __vtable_CTU_INT: VTableCTU<i16> = VTableCTU {
88-
body: CTU_INT,
89-
};
85+
pub static __vtable_CTU_INT: VTableCTU<i16> = VTableCTU { body: CTU_INT };
9086

9187
#[allow(non_upper_case_globals)]
9288
#[no_mangle]
@@ -113,9 +109,7 @@ pub extern "C" fn CTU_INT(params: &mut CTUParams<i16>) {
113109
#[allow(non_upper_case_globals)]
114110
#[no_mangle]
115111
#[used]
116-
pub static __vtable_CTU_DINT: VTableCTU<i32> = VTableCTU {
117-
body: CTU_DINT,
118-
};
112+
pub static __vtable_CTU_DINT: VTableCTU<i32> = VTableCTU { body: CTU_DINT };
119113

120114
#[allow(non_upper_case_globals)]
121115
#[no_mangle]
@@ -142,9 +136,7 @@ pub extern "C" fn CTU_DINT(params: &mut CTUParams<i32>) {
142136
#[allow(non_upper_case_globals)]
143137
#[no_mangle]
144138
#[used]
145-
pub static __vtable_CTU_UDINT: VTableCTU<u32> = VTableCTU {
146-
body: CTU_UDINT,
147-
};
139+
pub static __vtable_CTU_UDINT: VTableCTU<u32> = VTableCTU { body: CTU_UDINT };
148140

149141
#[allow(non_upper_case_globals)]
150142
#[no_mangle]
@@ -171,9 +163,7 @@ pub extern "C" fn CTU_UDINT(params: &mut CTUParams<u32>) {
171163
#[allow(non_upper_case_globals)]
172164
#[no_mangle]
173165
#[used]
174-
pub static __vtable_CTU_LINT: VTableCTU<i64> = VTableCTU {
175-
body: CTU_LINT,
176-
};
166+
pub static __vtable_CTU_LINT: VTableCTU<i64> = VTableCTU { body: CTU_LINT };
177167

178168
#[allow(non_upper_case_globals)]
179169
#[no_mangle]
@@ -200,9 +190,7 @@ pub extern "C" fn CTU_LINT(params: &mut CTUParams<i64>) {
200190
#[allow(non_upper_case_globals)]
201191
#[no_mangle]
202192
#[used]
203-
pub static __vtable_CTU_ULINT: VTableCTU<u64> = VTableCTU {
204-
body: CTU_ULINT,
205-
};
193+
pub static __vtable_CTU_ULINT: VTableCTU<u64> = VTableCTU { body: CTU_ULINT };
206194

207195
#[allow(non_upper_case_globals)]
208196
#[no_mangle]
@@ -279,9 +267,7 @@ where
279267
#[allow(non_upper_case_globals)]
280268
#[no_mangle]
281269
#[used]
282-
pub static __vtable_CTD: VTableCTD<i16> = VTableCTD {
283-
body: CTD,
284-
};
270+
pub static __vtable_CTD: VTableCTD<i16> = VTableCTD { body: CTD };
285271

286272
#[allow(non_upper_case_globals)]
287273
#[no_mangle]
@@ -308,9 +294,7 @@ pub extern "C" fn CTD(params: &mut CTDParams<i16>) {
308294
#[allow(non_upper_case_globals)]
309295
#[no_mangle]
310296
#[used]
311-
pub static __vtable_CTD_INT: VTableCTD<i16> = VTableCTD {
312-
body: CTD_INT,
313-
};
297+
pub static __vtable_CTD_INT: VTableCTD<i16> = VTableCTD { body: CTD_INT };
314298

315299
#[allow(non_upper_case_globals)]
316300
#[no_mangle]
@@ -337,9 +321,7 @@ pub extern "C" fn CTD_INT(params: &mut CTDParams<i16>) {
337321
#[allow(non_upper_case_globals)]
338322
#[no_mangle]
339323
#[used]
340-
pub static __vtable_CTD_DINT: VTableCTD<i32> = VTableCTD {
341-
body: CTD_DINT,
342-
};
324+
pub static __vtable_CTD_DINT: VTableCTD<i32> = VTableCTD { body: CTD_DINT };
343325

344326
#[allow(non_upper_case_globals)]
345327
#[no_mangle]
@@ -366,9 +348,7 @@ pub extern "C" fn CTD_DINT(params: &mut CTDParams<i32>) {
366348
#[allow(non_upper_case_globals)]
367349
#[no_mangle]
368350
#[used]
369-
pub static __vtable_CTD_UDINT: VTableCTD<u32> = VTableCTD {
370-
body: CTD_UDINT,
371-
};
351+
pub static __vtable_CTD_UDINT: VTableCTD<u32> = VTableCTD { body: CTD_UDINT };
372352

373353
#[allow(non_upper_case_globals)]
374354
#[no_mangle]
@@ -395,9 +375,7 @@ pub extern "C" fn CTD_UDINT(params: &mut CTDParams<u32>) {
395375
#[allow(non_upper_case_globals)]
396376
#[no_mangle]
397377
#[used]
398-
pub static __vtable_CTD_LINT: VTableCTD<i64> = VTableCTD {
399-
body: CTD_LINT,
400-
};
378+
pub static __vtable_CTD_LINT: VTableCTD<i64> = VTableCTD { body: CTD_LINT };
401379

402380
#[allow(non_upper_case_globals)]
403381
#[no_mangle]
@@ -424,9 +402,7 @@ pub extern "C" fn CTD_LINT(params: &mut CTDParams<i64>) {
424402
#[allow(non_upper_case_globals)]
425403
#[no_mangle]
426404
#[used]
427-
pub static __vtable_CTD_ULINT: VTableCTD<u64> = VTableCTD {
428-
body: CTD_ULINT,
429-
};
405+
pub static __vtable_CTD_ULINT: VTableCTD<u64> = VTableCTD { body: CTD_ULINT };
430406

431407
#[allow(non_upper_case_globals)]
432408
#[no_mangle]
@@ -534,9 +510,7 @@ where
534510
#[allow(non_upper_case_globals)]
535511
#[no_mangle]
536512
#[used]
537-
pub static __vtable_CTUD: VTableCTUD<i16> = VTableCTUD {
538-
body: CTUD,
539-
};
513+
pub static __vtable_CTUD: VTableCTUD<i16> = VTableCTUD { body: CTUD };
540514

541515
#[allow(non_upper_case_globals)]
542516
#[no_mangle]
@@ -567,9 +541,7 @@ pub extern "C" fn CTUD(params: &mut CTUDParams<i16>) {
567541
#[allow(non_upper_case_globals)]
568542
#[no_mangle]
569543
#[used]
570-
pub static __vtable_CTUD_INT: VTableCTUD<i16> = VTableCTUD {
571-
body: CTUD_INT,
572-
};
544+
pub static __vtable_CTUD_INT: VTableCTUD<i16> = VTableCTUD { body: CTUD_INT };
573545

574546
#[allow(non_upper_case_globals)]
575547
#[no_mangle]
@@ -600,9 +572,7 @@ pub extern "C" fn CTUD_INT(params: &mut CTUDParams<i16>) {
600572
#[allow(non_upper_case_globals)]
601573
#[no_mangle]
602574
#[used]
603-
pub static __vtable_CTUD_DINT: VTableCTUD<i32> = VTableCTUD {
604-
body: CTUD_DINT,
605-
};
575+
pub static __vtable_CTUD_DINT: VTableCTUD<i32> = VTableCTUD { body: CTUD_DINT };
606576

607577
#[allow(non_upper_case_globals)]
608578
#[no_mangle]
@@ -633,9 +603,7 @@ pub extern "C" fn CTUD_DINT(params: &mut CTUDParams<i32>) {
633603
#[allow(non_upper_case_globals)]
634604
#[no_mangle]
635605
#[used]
636-
pub static __vtable_CTUD_UDINT: VTableCTUD<u32> = VTableCTUD {
637-
body: CTUD_UDINT,
638-
};
606+
pub static __vtable_CTUD_UDINT: VTableCTUD<u32> = VTableCTUD { body: CTUD_UDINT };
639607

640608
#[allow(non_upper_case_globals)]
641609
#[no_mangle]
@@ -666,9 +634,7 @@ pub extern "C" fn CTUD_UDINT(params: &mut CTUDParams<u32>) {
666634
#[allow(non_upper_case_globals)]
667635
#[no_mangle]
668636
#[used]
669-
pub static __vtable_CTUD_LINT: VTableCTUD<i64> = VTableCTUD {
670-
body: CTUD_LINT,
671-
};
637+
pub static __vtable_CTUD_LINT: VTableCTUD<i64> = VTableCTUD { body: CTUD_LINT };
672638

673639
#[allow(non_upper_case_globals)]
674640
#[no_mangle]
@@ -699,9 +665,7 @@ pub extern "C" fn CTUD_LINT(params: &mut CTUDParams<i64>) {
699665
#[allow(non_upper_case_globals)]
700666
#[no_mangle]
701667
#[used]
702-
pub static __vtable_CTUD_ULINT: VTableCTUD<u64> = VTableCTUD {
703-
body: CTUD_ULINT,
704-
};
668+
pub static __vtable_CTUD_ULINT: VTableCTUD<u64> = VTableCTUD { body: CTUD_ULINT };
705669

706670
#[allow(non_upper_case_globals)]
707671
#[no_mangle]

‎libs/stdlib/src/flanks.rs

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,13 @@ pub struct VTableTrigger {
2323
#[allow(non_upper_case_globals)]
2424
#[no_mangle]
2525
#[used]
26-
pub static __vtable_R_TRIG: VTableTrigger = VTableTrigger {
27-
body: R_TRIG,
28-
};
26+
pub static __vtable_R_TRIG: VTableTrigger = VTableTrigger { body: R_TRIG };
2927

3028
#[allow(non_upper_case_globals)]
3129
#[no_mangle]
3230
#[used]
33-
pub static __R_TRIG__init: Trigger = Trigger {
34-
__vtable: 0,
35-
clk: false,
36-
output: false,
37-
internal: Signal { current_value: false },
38-
};
31+
pub static __R_TRIG__init: Trigger =
32+
Trigger { __vtable: 0, clk: false, output: false, internal: Signal { current_value: false } };
3933

4034
#[allow(non_snake_case)]
4135
#[no_mangle]
@@ -47,19 +41,13 @@ pub extern "C" fn R_TRIG(trigger: &mut Trigger) {
4741
#[allow(non_upper_case_globals)]
4842
#[no_mangle]
4943
#[used]
50-
pub static __vtable_F_TRIG: VTableTrigger = VTableTrigger {
51-
body: F_TRIG,
52-
};
44+
pub static __vtable_F_TRIG: VTableTrigger = VTableTrigger { body: F_TRIG };
5345

5446
#[allow(non_upper_case_globals)]
5547
#[no_mangle]
5648
#[used]
57-
pub static __F_TRIG__init: Trigger = Trigger {
58-
__vtable: 0,
59-
clk: false,
60-
output: false,
61-
internal: Signal { current_value: false },
62-
};
49+
pub static __F_TRIG__init: Trigger =
50+
Trigger { __vtable: 0, clk: false, output: false, internal: Signal { current_value: false } };
6351

6452
#[allow(non_snake_case)]
6553
#[no_mangle]

‎libs/stdlib/src/timers.rs

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ impl TimerParams {
8989
#[allow(non_upper_case_globals)]
9090
#[no_mangle]
9191
#[used]
92-
pub static __vtable_TP: VTableTimer = VTableTimer {
93-
body: TP,
94-
};
92+
pub static __vtable_TP: VTableTimer = VTableTimer { body: TP };
9593

9694
#[allow(non_upper_case_globals)]
9795
#[no_mangle]
@@ -135,9 +133,7 @@ pub extern "C" fn TP(timer: &mut TimerParams) {
135133
#[allow(non_upper_case_globals)]
136134
#[no_mangle]
137135
#[used]
138-
pub static __vtable_TON: VTableTimer = VTableTimer {
139-
body: TON,
140-
};
136+
pub static __vtable_TON: VTableTimer = VTableTimer { body: TON };
141137

142138
#[allow(non_upper_case_globals)]
143139
#[no_mangle]
@@ -182,9 +178,7 @@ pub extern "C" fn TON(timer: &mut TimerParams) {
182178
#[allow(non_upper_case_globals)]
183179
#[no_mangle]
184180
#[used]
185-
pub static __vtable_TOF: VTableTimer = VTableTimer {
186-
body: TOF,
187-
};
181+
pub static __vtable_TOF: VTableTimer = VTableTimer { body: TOF };
188182

189183
#[allow(non_upper_case_globals)]
190184
#[no_mangle]
@@ -225,9 +219,7 @@ pub extern "C" fn TOF(timer: &mut TimerParams) {
225219
#[allow(non_upper_case_globals)]
226220
#[no_mangle]
227221
#[used]
228-
pub static __vtable_TP_TIME: VTableTimer = VTableTimer {
229-
body: TP_TIME,
230-
};
222+
pub static __vtable_TP_TIME: VTableTimer = VTableTimer { body: TP_TIME };
231223

232224
#[allow(non_upper_case_globals)]
233225
#[no_mangle]
@@ -252,9 +244,7 @@ pub extern "C" fn TP_TIME(timer: &mut TimerParams) {
252244
#[allow(non_upper_case_globals)]
253245
#[no_mangle]
254246
#[used]
255-
pub static __vtable_TP_LTIME: VTableTimer = VTableTimer {
256-
body: TP_LTIME,
257-
};
247+
pub static __vtable_TP_LTIME: VTableTimer = VTableTimer { body: TP_LTIME };
258248

259249
#[allow(non_upper_case_globals)]
260250
#[no_mangle]
@@ -279,9 +269,7 @@ pub extern "C" fn TP_LTIME(timer: &mut TimerParams) {
279269
#[allow(non_upper_case_globals)]
280270
#[no_mangle]
281271
#[used]
282-
pub static __vtable_TON_TIME: VTableTimer = VTableTimer {
283-
body: TON_TIME,
284-
};
272+
pub static __vtable_TON_TIME: VTableTimer = VTableTimer { body: TON_TIME };
285273

286274
#[allow(non_upper_case_globals)]
287275
#[no_mangle]
@@ -306,9 +294,7 @@ pub extern "C" fn TON_TIME(timer: &mut TimerParams) {
306294
#[allow(non_upper_case_globals)]
307295
#[no_mangle]
308296
#[used]
309-
pub static __vtable_TON_LTIME: VTableTimer = VTableTimer {
310-
body: TON_LTIME,
311-
};
297+
pub static __vtable_TON_LTIME: VTableTimer = VTableTimer { body: TON_LTIME };
312298

313299
#[allow(non_upper_case_globals)]
314300
#[no_mangle]
@@ -333,9 +319,7 @@ pub extern "C" fn TON_LTIME(timer: &mut TimerParams) {
333319
#[allow(non_upper_case_globals)]
334320
#[no_mangle]
335321
#[used]
336-
pub static __vtable_TOF_TIME: VTableTimer = VTableTimer {
337-
body: TOF_TIME,
338-
};
322+
pub static __vtable_TOF_TIME: VTableTimer = VTableTimer { body: TOF_TIME };
339323

340324
#[allow(non_upper_case_globals)]
341325
#[no_mangle]
@@ -360,9 +344,7 @@ pub extern "C" fn TOF_TIME(timer: &mut TimerParams) {
360344
#[allow(non_upper_case_globals)]
361345
#[no_mangle]
362346
#[used]
363-
pub static __vtable_TOF_LTIME: VTableTimer = VTableTimer {
364-
body: TOF_LTIME,
365-
};
347+
pub static __vtable_TOF_LTIME: VTableTimer = VTableTimer { body: TOF_LTIME };
366348

367349
#[allow(non_upper_case_globals)]
368350
#[no_mangle]

0 commit comments

Comments
 (0)