rust: Run rustfmt with some experimental options

+ Sort and group the imports
+ Normalize and format comments (100 characters width)

Command used:

$ cargo +nightly fmt --

Acked-by: Steffen Eiden <seiden@linux.ibm.com>
Signed-off-by: Marc Hartmayer <marc@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>

rust/pvattest/src/cmd/check.rs

@@ -6,28 +6,22 @@ mod firmware;
 mod host_key;
 mod secret_store;
 
-use self::{
-    firmware::firmware_check,
-    host_key::{host_key_check, HostKeyCheck},
-    secret_store::secret_store_check,
-    secret_store::SecretStoreCheck,
-};
-use crate::{
-    additional::AttestationResult,
-    cli::{CheckOpt, CheckOptIO},
-    exchange::ExchangeFormatResponse,
-};
+use std::process::ExitCode;
 
 use anyhow::Result;
 use log::{debug, info, warn};
-use pv::{
-    attest::AttestationRequest,
-    misc::{create_file, open_file, read_file},
-};
+use pv::attest::AttestationRequest;
+use pv::misc::{create_file, open_file, read_file};
 use serde::Serialize;
-use std::process::ExitCode;
 use utils::HexSlice;
 
+use self::firmware::firmware_check;
+use self::host_key::{host_key_check, HostKeyCheck};
+use self::secret_store::{secret_store_check, SecretStoreCheck};
+use crate::additional::AttestationResult;
+use crate::cli::{CheckOpt, CheckOptIO};
+use crate::exchange::ExchangeFormatResponse;
+
 #[derive(Default, Debug)]
 enum CheckState<T> {
     #[default]

rust/pvattest/src/cmd/check/firmware.rs

@@ -2,7 +2,8 @@
 //
 // Copyright IBM Corp. 2024
 
-use std::{fmt::Display, time::Duration};
+use std::fmt::Display;
+use std::time::Duration;
 
 use anyhow::{bail, Result};
 use base64::prelude::*;
@@ -11,7 +12,8 @@ use log::{debug, info, log_enabled};
 use serde::{Deserialize, Serialize};
 
 use super::{bail_check, CheckState};
-use crate::{additional::AttestationResult, cli::CheckOpt};
+use crate::additional::AttestationResult;
+use crate::cli::CheckOpt;
 
 const CHECK_DEFAULT_ENDP: &str = "https://esupport.ibm.com/eccedge/ent/z";
 const VERIFY_API: &str = "hmrs/firmware/attestation/v1/verify";

rust/pvattest/src/cmd/check/host_key.rs

@@ -2,21 +2,20 @@
 //
 // Copyright IBM Corp. 2024
 
+use std::fmt::Display;
+use std::path::Path;
+
 use anyhow::Result;
 use log::{debug, info};
-use pv::{
-    misc::{read_certs, read_file},
-    request::{openssl::DigestBytes, EcPubKeyCoord},
-};
+use pv::misc::{read_certs, read_file};
+use pv::request::openssl::DigestBytes;
+use pv::request::EcPubKeyCoord;
 use serde::Serialize;
-use std::{fmt::Display, path::Path};
 use utils::HexSlice;
 
 use super::CheckState;
-use crate::{
-    additional::AttestationResult,
-    cli::{CheckOpt, HostKeyCheckPolicy},
-};
+use crate::additional::AttestationResult;
+use crate::cli::{CheckOpt, HostKeyCheckPolicy};
 
 #[derive(Debug, Clone, Copy)]
 pub enum HkCheck {

rust/pvattest/src/cmd/check/secret_store.rs

@@ -6,13 +6,14 @@ use std::path::{Path, PathBuf};
 
 use anyhow::Result;
 use log::info;
-use openssl::hash::DigestBytes;
-use openssl::hash::{hash, MessageDigest};
-use pv::{misc::read_file, secret::AddSecretRequest};
+use openssl::hash::{hash, DigestBytes, MessageDigest};
+use pv::misc::read_file;
+use pv::secret::AddSecretRequest;
 use serde::Serialize;
 
 use super::{bail_check, CheckState};
-use crate::{additional::AttestationResult, cli::CheckOpt};
+use crate::additional::AttestationResult;
+use crate::cli::CheckOpt;
 
 #[derive(Debug, Serialize)]
 pub struct SecretStoreCheck<'a> {

rust/pvattest/src/cmd/create.rs

@@ -2,18 +2,16 @@
 //
 // Copyright IBM Corp. 2024
 
-use crate::{
-    cli::{AttAddFlags, CreateAttOpt},
-    exchange::{ExchangeFormatRequest, ExchangeFormatVersion},
-};
+use std::process::ExitCode;
+
 use anyhow::{bail, Context, Result};
 use log::{debug, warn};
-use pv::{
-    attest::{AttestationFlags, AttestationMeasAlg, AttestationRequest, AttestationVersion},
-    misc::{create_file, write_file},
-    request::{ReqEncrCtx, Request, SymKey, SymKeyType},
-};
-use std::process::ExitCode;
+use pv::attest::{AttestationFlags, AttestationMeasAlg, AttestationRequest, AttestationVersion};
+use pv::misc::{create_file, write_file};
+use pv::request::{ReqEncrCtx, Request, SymKey, SymKeyType};
+
+use crate::cli::{AttAddFlags, CreateAttOpt};
+use crate::exchange::{ExchangeFormatRequest, ExchangeFormatVersion};
 
 fn flags(cli_flags: &[AttAddFlags]) -> AttestationFlags {
     let mut att_flags = AttestationFlags::default();

rust/pvattest/src/cmd/perform.rs

@@ -2,17 +2,15 @@
 //
 // Copyright IBM Corp. 2024
 
-use crate::{
-    cli::PerformAttOptComb,
-    exchange::{ExchangeFormatRequest, ExchangeFormatResponse, ExchangeFormatVersion},
-};
-use anyhow::Result;
-use pv::{
-    misc::{create_file, open_file, read_file},
-    uv::{AttestationCmd, UvDevice},
-};
 use std::process::ExitCode;
 
+use anyhow::Result;
+use pv::misc::{create_file, open_file, read_file};
+use pv::uv::{AttestationCmd, UvDevice};
+
+use crate::cli::PerformAttOptComb;
+use crate::exchange::{ExchangeFormatRequest, ExchangeFormatResponse, ExchangeFormatVersion};
+
 pub fn perform<'a, P>(opt: P) -> Result<ExitCode>
 where
     P: Into<PerformAttOptComb<'a>>,

rust/pvattest/src/cmd/verify.rs

@@ -2,22 +2,20 @@
 //
 // Copyright IBM Corp. 2024
 
+use std::process::ExitCode;
+
 use anyhow::Result;
 use log::{debug, warn};
-use pv::{
-    attest::{AttestationItems, AttestationMeasurement, AttestationRequest},
-    misc::{create_file, open_file, read_exact_file, write_file},
-    request::{openssl::pkey::PKey, BootHdrTags, Confidential, SymKey},
-};
-use std::process::ExitCode;
+use pv::attest::{AttestationItems, AttestationMeasurement, AttestationRequest};
+use pv::misc::{create_file, open_file, read_exact_file, write_file};
+use pv::request::openssl::pkey::PKey;
+use pv::request::{BootHdrTags, Confidential, SymKey};
 use utils::HexSlice;
 
-use crate::{
-    additional::AttestationResult,
-    cli::{OutputType, VerifyOpt},
-    exchange::ExchangeFormatResponse,
-    EXIT_CODE_ATTESTATION_FAIL,
-};
+use crate::additional::AttestationResult;
+use crate::cli::{OutputType, VerifyOpt};
+use crate::exchange::ExchangeFormatResponse;
+use crate::EXIT_CODE_ATTESTATION_FAIL;
 
 pub fn verify(opt: &VerifyOpt) -> Result<ExitCode> {
     let mut input = open_file(&opt.input)?;