Skip to content

Commit 8e77d06

Browse files
committed
codegen: Fix fmt and clippy
1 parent 831d6a6 commit 8e77d06

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

codegen/src/codegen/gpio.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ fn merge_pins_by_port(pins: &[gpio::Pin]) -> Result<Vec<Port>> {
6262
fn gen_gpio_macro_call(ports: &[Port], feature: &str) -> Result<()> {
6363
println!("gpio!({{");
6464

65-
let mut pac_modules: Vec<_> = ports.iter().map(|port| get_port_pac_module(port, feature)).collect();
66-
pac_modules.sort();
67-
pac_modules.dedup();
68-
println!(" pacs: [{}],", pac_modules.join(", "));
65+
gen_pac_list(ports, feature);
6966

7067
println!(" ports: [");
7168
for port in ports {
@@ -77,6 +74,16 @@ fn gen_gpio_macro_call(ports: &[Port], feature: &str) -> Result<()> {
7774
Ok(())
7875
}
7976

77+
fn gen_pac_list(ports: &[Port], feature: &str) {
78+
let mut pac_modules: Vec<_> = ports
79+
.iter()
80+
.map(|port| get_port_pac_module(port, feature))
81+
.collect();
82+
pac_modules.sort_unstable();
83+
pac_modules.dedup();
84+
println!(" pacs: [{}],", pac_modules.join(", "));
85+
}
86+
8087
fn gen_port(port: &Port, feature: &str) -> Result<()> {
8188
let pac_module = get_port_pac_module(port, feature);
8289

@@ -117,10 +124,7 @@ fn gen_pin(pin: &gpio::Pin) -> Result<()> {
117124

118125
println!(
119126
" {} => {{ reset: {}, afr: {}, af: {:?} }},",
120-
nr,
121-
reset_mode,
122-
afr,
123-
af_numbers,
127+
nr, reset_mode, afr, af_numbers,
124128
);
125129

126130
Ok(())
@@ -142,7 +146,7 @@ fn get_pin_af_numbers(pin: &gpio::Pin) -> Result<Vec<u8>> {
142146
numbers.push(signal.af()?);
143147
}
144148

145-
numbers.sort();
149+
numbers.sort_unstable();
146150
numbers.dedup();
147151

148152
Ok(numbers)

0 commit comments

Comments
 (0)