Ran cargo +nightly fmt on bootloader-tool

Author: Wassasin

bootloader-tool/src/commands/download.rs

@@ -1,13 +1,15 @@
+use std::path::Path;
+
+use DownloadCommands::Other;
+use anyhow::Context;
+use probe_rs::flashing::ElfOptions;
+use probe_rs::{Session, flashing};
+
 use crate::commands::sign::SignOutput;
 use crate::config::Config;
 use crate::processors::certificates::Rkth;
 use crate::processors::probe;
 use crate::{DownloadCommands, ProbeArgs, RunCommands, SignCommands};
-use DownloadCommands::Other;
-use anyhow::Context;
-use probe_rs::flashing::ElfOptions;
-use probe_rs::{Session, flashing};
-use std::path::Path;
 
 pub async fn process(config: &Config, command: DownloadCommands) -> anyhow::Result<()> {
     match command {

bootloader-tool/src/commands/generate.rs

@@ -1,4 +1,5 @@
-use crate::{GenerateCommands, config::Config, processors};
+use crate::config::Config;
+use crate::{GenerateCommands, processors};
 
 pub async fn process(config: &Config, command: GenerateCommands) -> anyhow::Result<()> {
     match command {

bootloader-tool/src/commands/mod.rs

@@ -3,7 +3,8 @@ mod generate;
 mod run;
 mod sign;
 
-use crate::{Commands, config::Config};
+use crate::Commands;
+use crate::config::Config;
 
 pub async fn process(config: &Config, command: Commands) -> anyhow::Result<()> {
     match command {

bootloader-tool/src/commands/run.rs

@@ -1,6 +1,9 @@
 use probe_rs::MemoryInterface;
 
-use crate::{RunCommands, commands::download::DownloadOutput, config::Config, processors::otp};
+use crate::RunCommands;
+use crate::commands::download::DownloadOutput;
+use crate::config::Config;
+use crate::processors::otp;
 
 pub async fn process(config: &Config, command: RunCommands) -> anyhow::Result<()> {
     let otp = otp::get_otp(config)?;

bootloader-tool/src/commands/sign.rs

@@ -1,12 +1,14 @@
+use std::path::PathBuf;
+
+use anyhow::Context;
+use object::read::elf::ElfFile32;
+
 use crate::SignCommands;
 use crate::config::Config;
 use crate::processors::certificates::Rkth;
 use crate::processors::mbi::cert_block;
 use crate::processors::otp::get_otp;
 use crate::processors::{mbi, objcopy};
-use anyhow::Context;
-use object::read::elf::ElfFile32;
-use std::path::PathBuf;
 
 pub struct SignOutput {
     pub output_path: Option<PathBuf>,

bootloader-tool/src/config.rs

@@ -1,8 +1,9 @@
 #![allow(unused)]
 
-use serde::Deserialize;
 use std::path::{Path, PathBuf};
 
+use serde::Deserialize;
+
 #[derive(Deserialize, Debug)]
 pub struct Config {
     /// Path of the directory where artifacts are put and can be found.

bootloader-tool/src/lib.rs

@@ -1,7 +1,9 @@
-pub use crate::config::Config;
-use clap::{Args, Parser, Subcommand};
 use std::path::PathBuf;
 
+use clap::{Args, Parser, Subcommand};
+
+pub use crate::config::Config;
+
 pub mod commands;
 mod config;
 pub mod processors;

bootloader-tool/src/main.rs

@@ -11,8 +11,8 @@ async fn main() -> anyhow::Result<()> {
 
     let cli = Cli::parse();
 
-    let config = Config::read(&cli.config)
-        .with_context(|| format!("Tried to open --config {}", cli.config.display()))?;
+    let config =
+        Config::read(&cli.config).with_context(|| format!("Tried to open --config {}", cli.config.display()))?;
 
     if let Some(command) = cli.commands {
         commands::process(&config, command).await

bootloader-tool/src/processors/certificates.rs

@@ -1,16 +1,12 @@
-use std::{
-    path::{Path, PathBuf},
-    process::{Command, Stdio},
-};
+use std::path::{Path, PathBuf};
+use std::process::{Command, Stdio};
 
 use anyhow::Context;
 use serde::Serialize;
 
-use crate::{
-    GenerateCertificatesArguments,
-    config::{Certificate, CertificatePrototype, Config},
-    util::{bytes_to_u32_le, generate_hex, parse_hex},
-};
+use crate::GenerateCertificatesArguments;
+use crate::config::{Certificate, CertificatePrototype, Config};
+use crate::util::{bytes_to_u32_le, generate_hex, parse_hex};
 
 #[derive(Serialize)]
 struct BasicConstraints {

bootloader-tool/src/processors/mbi/cert_block.rs

@@ -1,19 +1,19 @@
-use std::{
-    collections::BTreeMap,
-    path::{Path, PathBuf},
-    process::{Command, Stdio},
-};
+use std::collections::BTreeMap;
+use std::path::{Path, PathBuf};
+use std::process::{Command, Stdio};
 
 use anyhow::Context;
-use rsa::{RsaPublicKey, pkcs1v15::VerifyingKey, pkcs8::DecodePublicKey, traits::PublicKeyParts};
+use rsa::RsaPublicKey;
+use rsa::pkcs1v15::VerifyingKey;
+use rsa::pkcs8::DecodePublicKey;
+use rsa::traits::PublicKeyParts;
 use serde::Serialize;
 use sha2::{Digest, Sha256};
 use x509_parser::public_key::PublicKey;
 
-use crate::{
-    Config,
-    processors::{certificates::Rkth, mbi::parse_x509_cert},
-};
+use crate::Config;
+use crate::processors::certificates::Rkth;
+use crate::processors::mbi::parse_x509_cert;
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]