Skip to content

Commit f572e58

Browse files
valffvalff
committed
Reformat with use_small_heuristics = "Max"
1 parent a2c83af commit f572e58

File tree

15 files changed

+93
-278
lines changed

15 files changed

+93
-278
lines changed

‎config/src/lib.rs‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,10 @@ impl Config {
6262
}
6363

6464
fn check_heap(&self) -> Result<()> {
65-
let Self {
66-
heap: Heap { size, pools },
67-
..
68-
} = self;
65+
let Self { heap: Heap { size, pools }, .. } = self;
6966
let used: u32 = pools.iter().map(|pool| pool.block * pool.capacity).sum();
7067
if used != *size {
71-
bail!(
72-
"{}: `heap.pools` adds up to {}, but `heap.size = {}",
73-
CONFIG_NAME,
74-
used,
75-
size
76-
);
68+
bail!("{}: `heap.pools` adds up to {}, but `heap.size = {}", CONFIG_NAME, used, size);
7769
}
7870
Ok(())
7971
}

‎rustfmt.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ format_strings = true
55
merge_imports = true
66
newline_style = "Unix"
77
overflow_delimited_expr = true
8+
reorder_impl_items = true
89
unstable_features = true
910
use_field_init_shorthand = true
11+
use_small_heuristics = "Max"
1012
version = "Two"

‎src/bin/drone-ld.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ fn main() {
2626
let config = Config::read_from_current_dir()?;
2727
let script = Registry::new()?.layout_ld(&config)?;
2828
let signals = register_signals()?;
29-
let linker = linker_command(script.as_ref(), &args, &[
30-
"--defsym=_section_size_unknown=0".into(),
31-
])?;
29+
let linker =
30+
linker_command(script.as_ref(), &args, &["--defsym=_section_size_unknown=0".into()])?;
3231
block_with_signals(&signals, true, || run_command(linker))?;
3332
let size = size_command(&output)?;
3433
let syms = block_with_signals(&signals, true, || run_size(size))?

‎src/cli.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ fn parse_color(src: &str) -> Result<ColorChoice, Error> {
173173
"always" => ColorChoice::Always,
174174
"never" => ColorChoice::Never,
175175
"auto" => ColorChoice::Auto,
176-
_ => bail!(
177-
"argument for --color must be auto, always, or never, but found `{}`",
178-
src
179-
),
176+
_ => bail!("argument for --color must be auto, always, or never, but found `{}`", src),
180177
})
181178
}

‎src/device.rs‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -299,54 +299,54 @@ impl Device {
299299
Self::Nrf52811 => (crates::Bindings::Nrf, "nrf52811", &[]),
300300
Self::Nrf52832 => (crates::Bindings::Nrf, "nrf52832", &[]),
301301
Self::Nrf52840 => (crates::Bindings::Nrf, "nrf52840", &[]),
302-
Self::Stm32F100 => (crates::Bindings::Stm32, "stm32f100", &[
303-
"dma", "gpio", "spi", "tim",
304-
]),
305-
Self::Stm32F101 => (crates::Bindings::Stm32, "stm32f101", &[
306-
"dma", "gpio", "spi", "tim",
307-
]),
308-
Self::Stm32F102 => (crates::Bindings::Stm32, "stm32f102", &[
309-
"dma", "gpio", "spi", "tim",
310-
]),
311-
Self::Stm32F103 => (crates::Bindings::Stm32, "stm32f103", &[
312-
"dma", "gpio", "spi", "tim",
313-
]),
314-
Self::Stm32F107 => (crates::Bindings::Stm32, "stm32f107", &[
315-
"dma", "gpio", "spi", "tim",
316-
]),
317-
Self::Stm32F401 => (crates::Bindings::Stm32, "stm32f401", &[
318-
"adc", "dma", "exti", "gpio", "tim",
319-
]),
320-
Self::Stm32F405 => (crates::Bindings::Stm32, "stm32f405", &[
321-
"adc", "dma", "exti", "gpio", "tim",
322-
]),
323-
Self::Stm32F407 => (crates::Bindings::Stm32, "stm32f407", &[
324-
"adc", "dma", "exti", "gpio", "tim",
325-
]),
326-
Self::Stm32F410 => (crates::Bindings::Stm32, "stm32f410", &[
327-
"adc", "dma", "exti", "gpio", "tim",
328-
]),
329-
Self::Stm32F411 => (crates::Bindings::Stm32, "stm32f411", &[
330-
"adc", "dma", "exti", "gpio", "tim",
331-
]),
332-
Self::Stm32F412 => (crates::Bindings::Stm32, "stm32f412", &[
333-
"adc", "dma", "exti", "gpio", "tim",
334-
]),
335-
Self::Stm32F413 => (crates::Bindings::Stm32, "stm32f413", &[
336-
"adc", "dma", "exti", "gpio", "tim",
337-
]),
338-
Self::Stm32F427 => (crates::Bindings::Stm32, "stm32f427", &[
339-
"adc", "dma", "exti", "gpio", "tim",
340-
]),
341-
Self::Stm32F429 => (crates::Bindings::Stm32, "stm32f429", &[
342-
"adc", "dma", "exti", "gpio", "tim",
343-
]),
344-
Self::Stm32F446 => (crates::Bindings::Stm32, "stm32f446", &[
345-
"adc", "dma", "exti", "gpio", "tim",
346-
]),
347-
Self::Stm32F469 => (crates::Bindings::Stm32, "stm32f469", &[
348-
"adc", "dma", "exti", "gpio", "tim",
349-
]),
302+
Self::Stm32F100 => {
303+
(crates::Bindings::Stm32, "stm32f100", &["dma", "gpio", "spi", "tim"])
304+
}
305+
Self::Stm32F101 => {
306+
(crates::Bindings::Stm32, "stm32f101", &["dma", "gpio", "spi", "tim"])
307+
}
308+
Self::Stm32F102 => {
309+
(crates::Bindings::Stm32, "stm32f102", &["dma", "gpio", "spi", "tim"])
310+
}
311+
Self::Stm32F103 => {
312+
(crates::Bindings::Stm32, "stm32f103", &["dma", "gpio", "spi", "tim"])
313+
}
314+
Self::Stm32F107 => {
315+
(crates::Bindings::Stm32, "stm32f107", &["dma", "gpio", "spi", "tim"])
316+
}
317+
Self::Stm32F401 => {
318+
(crates::Bindings::Stm32, "stm32f401", &["adc", "dma", "exti", "gpio", "tim"])
319+
}
320+
Self::Stm32F405 => {
321+
(crates::Bindings::Stm32, "stm32f405", &["adc", "dma", "exti", "gpio", "tim"])
322+
}
323+
Self::Stm32F407 => {
324+
(crates::Bindings::Stm32, "stm32f407", &["adc", "dma", "exti", "gpio", "tim"])
325+
}
326+
Self::Stm32F410 => {
327+
(crates::Bindings::Stm32, "stm32f410", &["adc", "dma", "exti", "gpio", "tim"])
328+
}
329+
Self::Stm32F411 => {
330+
(crates::Bindings::Stm32, "stm32f411", &["adc", "dma", "exti", "gpio", "tim"])
331+
}
332+
Self::Stm32F412 => {
333+
(crates::Bindings::Stm32, "stm32f412", &["adc", "dma", "exti", "gpio", "tim"])
334+
}
335+
Self::Stm32F413 => {
336+
(crates::Bindings::Stm32, "stm32f413", &["adc", "dma", "exti", "gpio", "tim"])
337+
}
338+
Self::Stm32F427 => {
339+
(crates::Bindings::Stm32, "stm32f427", &["adc", "dma", "exti", "gpio", "tim"])
340+
}
341+
Self::Stm32F429 => {
342+
(crates::Bindings::Stm32, "stm32f429", &["adc", "dma", "exti", "gpio", "tim"])
343+
}
344+
Self::Stm32F446 => {
345+
(crates::Bindings::Stm32, "stm32f446", &["adc", "dma", "exti", "gpio", "tim"])
346+
}
347+
Self::Stm32F469 => {
348+
(crates::Bindings::Stm32, "stm32f469", &["adc", "dma", "exti", "gpio", "tim"])
349+
}
350350
Self::Stm32L4X1 => (crates::Bindings::Stm32, "stm32l4x1", &[
351351
"dma", "exti", "gpio", "i2c", "rtc", "spi", "tim", "uart",
352352
]),

‎src/heap/generate.rs‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,7 @@ pub fn display(w: &mut impl Write, layout: &[(u32, u32)]) -> Result<()> {
6565
if *capacity == 0 {
6666
continue;
6767
}
68-
writeln!(
69-
w,
70-
" {{ block = \"{}\", capacity = {} }},",
71-
format_size(*block),
72-
capacity
73-
)?;
68+
writeln!(w, " {{ block = \"{}\", capacity = {} }},", format_size(*block), capacity)?;
7469
}
7570
writeln!(w, "]")?;
7671
Ok(())
@@ -108,12 +103,7 @@ fn generate(
108103
shell.reset()?;
109104
write!(shell, "# Fragmentation: ")?;
110105
shell.set_color(ColorSpec::new().set_bold(true))?;
111-
writeln!(
112-
shell,
113-
"{} / {:.2}%",
114-
frag,
115-
f64::from(frag) / f64::from(size) * 100.0
116-
)?;
106+
writeln!(shell, "{} / {:.2}%", frag, f64::from(frag) / f64::from(size) * 100.0)?;
117107
shell.reset()?;
118108
writeln!(shell)?;
119109
display(&mut stdout(), &output)?;
@@ -155,10 +145,7 @@ fn shrink(input: &[(u32, u32)], output: &mut [(u32, u32)], frag: &mut u32, cutof
155145
}
156146

157147
fn extend(output: &mut [(u32, u32)], size: u32) {
158-
let mut used = output
159-
.iter()
160-
.map(|(block, capacity)| block * capacity)
161-
.sum::<u32>();
148+
let mut used = output.iter().map(|(block, capacity)| block * capacity).sum::<u32>();
162149
let count = output.len() as u32;
163150
let free = f64::from(size - used);
164151
for ((block, capacity), ratio) in output.iter_mut().zip(ratios(count)) {

‎src/heap/mod.rs‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ pub struct TraceEntry {
2121
impl HeapCmd {
2222
/// Runs the `drone heap` command.
2323
pub fn run(&self, shell: &mut StandardStream) -> Result<()> {
24-
let Self {
25-
trace_file,
26-
size,
27-
big_endian,
28-
heap_sub_cmd,
29-
} = self;
24+
let Self { trace_file, size, big_endian, heap_sub_cmd } = self;
3025
let size = size.map(Ok).unwrap_or_else(|| {
3126
config::Config::read_from_current_dir().map(|config| config.heap.size)
3227
})?;
@@ -65,23 +60,12 @@ fn print_stats(
6560
shell.reset()?;
6661
let mut used = 0;
6762
for (size, entry) in trace {
68-
writeln!(
69-
shell,
70-
" {: >6} {:11} {:13}",
71-
format_size(*size),
72-
entry.max,
73-
entry.total
74-
)?;
63+
writeln!(shell, " {: >6} {:11} {:13}", format_size(*size), entry.max, entry.total)?;
7564
used += size * entry.max;
7665
}
7766
write!(shell, "Maximum memory usage: ")?;
7867
shell.set_color(ColorSpec::new().set_bold(true))?;
79-
writeln!(
80-
shell,
81-
"{} / {:.2}%",
82-
used,
83-
f64::from(used) / f64::from(size) * 100.0
84-
)?;
68+
writeln!(shell, "{} / {:.2}%", used, f64::from(used) / f64::from(size) * 100.0)?;
8569
shell.reset()?;
8670
Ok(())
8771
}

‎src/heap/trace.rs‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,8 @@ fn parser<R: Read>(
8888
let mut header = [0; 2];
8989
let mut value = [0; 4];
9090
let parse_u32 = move |bytes| {
91-
let value = if big_endian {
92-
u32::from_be_bytes(bytes)
93-
} else {
94-
u32::from_le_bytes(bytes)
95-
};
96-
if value == 0 {
97-
Err(Error::InvalidValue)
98-
} else {
99-
Ok(value ^ KEY)
100-
}
91+
let value = if big_endian { u32::from_be_bytes(bytes) } else { u32::from_le_bytes(bytes) };
92+
if value == 0 { Err(Error::InvalidValue) } else { Ok(value ^ KEY) }
10193
};
10294
static move || {
10395
loop {

‎src/lib.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ use termcolor::StandardStream;
6060
impl Cli {
6161
/// Runs the program.
6262
pub fn run(self) -> Result<()> {
63-
let Self {
64-
cmd,
65-
color,
66-
verbosity,
67-
} = self;
63+
let Self { cmd, color, verbosity } = self;
6864
let log_level = match verbosity {
6965
0 => Level::Error,
7066
1 => Level::Warn,

‎src/new.rs‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,7 @@ use termcolor::{Color, ColorSpec, StandardStream, WriteColor};
2020
impl NewCmd {
2121
/// Runs the `drone new` command.
2222
pub fn run(&self, shell: &mut StandardStream) -> Result<()> {
23-
let Self {
24-
path,
25-
device,
26-
flash_size,
27-
ram_size,
28-
probe,
29-
probe_itm,
30-
name,
31-
toolchain,
32-
} = self;
23+
let Self { path, device, flash_size, ram_size, probe, probe_itm, name, toolchain } = self;
3324
let registry = Registry::new()?;
3425
let name = name.as_ref().map(String::as_str).map_or_else(
3526
|| {
@@ -49,10 +40,8 @@ impl NewCmd {
4940
},
5041
Ok,
5142
)?;
52-
let underscore_name = name
53-
.chars()
54-
.map(|c| if c == '-' { '_' } else { c })
55-
.collect::<String>();
43+
let underscore_name =
44+
name.chars().map(|c| if c == '-' { '_' } else { c }).collect::<String>();
5645

5746
cargo_new(path, &toolchain)?;
5847
src_main_rs(path, shell)?;
@@ -66,16 +55,7 @@ impl NewCmd {
6655
}
6756
}
6857
cargo_toml(path, &name, &device, &registry, shell)?;
69-
drone_toml(
70-
path,
71-
&device,
72-
*flash_size,
73-
*ram_size,
74-
&probe,
75-
&probe_itm,
76-
&registry,
77-
shell,
78-
)?;
58+
drone_toml(path, &device, *flash_size, *ram_size, &probe, &probe_itm, &registry, shell)?;
7959
justfile(path, &device, &registry, shell)?;
8060
rust_toolchain(path, &toolchain, &registry, shell)?;
8161
cargo_config(path, &registry, shell)?;
@@ -191,13 +171,9 @@ fn drone_toml(
191171
) -> Result<()> {
192172
let path = path.join("Drone.toml");
193173
let mut file = File::create(&path)?;
194-
let probe = probe
195-
.as_ref()
196-
.unwrap_or_else(|| device.probes().first().unwrap());
174+
let probe = probe.as_ref().unwrap_or_else(|| device.probes().first().unwrap());
197175
file.write_all(
198-
registry
199-
.new_drone_toml(device, flash_size, ram_size, probe, probe_itm)?
200-
.as_bytes(),
176+
registry.new_drone_toml(device, flash_size, ram_size, probe, probe_itm)?.as_bytes(),
201177
)?;
202178
print_created(shell, "Drone.toml")
203179
}

0 commit comments

Comments
 (0)