Skip to content

Commit 98a3395

Browse files
tippfehlrRahix
authored andcommitted
ravedude: Format code
1 parent 85df875 commit 98a3395

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

ravedude/src/config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl RavedudeConfig {
4949
port: args.port.clone(),
5050
reset_delay: args.reset_delay,
5151
board: args.legacy_board_name().clone(),
52-
output_mode: args.output_mode.unwrap_or(OutputMode::default()),
52+
output_mode: args.output_mode.unwrap_or_default(),
5353
newline_after: None,
5454
newline_on: None,
5555
},
@@ -67,7 +67,7 @@ impl RavedudeGeneralConfig {
6767
)
6868
}
6969

70-
return Ok(NewlineMode::Off);
70+
return Ok(NewlineMode::Off);
7171
}
7272

7373
Ok(match (self.newline_on.as_ref(), self.newline_after) {

ravedude/src/console.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ use std::io::Read as _;
22
use std::io::Write as _;
33

44
use anyhow::Context as _;
5-
use colored::Colorize as _;
65

76
use crate::config::NewlineMode;
87
use crate::config::OutputMode;
98
use crate::config::OutputMode::*;
10-
use crate::task_message;
119

1210
pub fn open(
1311
port: &std::path::PathBuf,
@@ -16,11 +14,6 @@ pub fn open(
1614
newline_mode: NewlineMode,
1715
space_after: Option<u8>,
1816
) -> anyhow::Result<()> {
19-
task_message!("Console", "{} at {} baud", port.display(), baudrate);
20-
task_message!("", "{}", "CTRL+C to exit.".dimmed());
21-
// Empty line for visual consistency
22-
eprintln!();
23-
2417
let mut rx = serialport::new(port.to_string_lossy(), baudrate)
2518
.timeout(std::time::Duration::from_secs(2))
2619
.open_native()

ravedude/src/main.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,7 @@ fn ravedude() -> anyhow::Result<()> {
348348
})?;
349349

350350
let port = port.context("console can only be opened for devices with USB-to-Serial")?;
351-
let newline_mode = ravedude_config.general_options.newline_mode()?;
352-
351+
let newline_mode = ravedude_config.general_options.newline_mode()?;
353352

354353
task_message!("Console", "{} at {} baud", port.display(), baudrate);
355354
task_message!("", "{}", "CTRL+C to exit.".dimmed());
@@ -358,9 +357,9 @@ fn ravedude() -> anyhow::Result<()> {
358357
console::open(
359358
&port,
360359
baudrate.get(),
361-
ravedude_config.general_options.output_mode,
362-
newline_mode,
363-
newline_mode.space_after()
360+
ravedude_config.general_options.output_mode,
361+
newline_mode,
362+
newline_mode.space_after(),
364363
)?;
365364
} else if args.bin.is_none() && port.is_some() {
366365
warning!("you probably meant to add -c/--open-console?");

0 commit comments

Comments
 (0)