api types: rust fmt

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-04-10 17:53:42 +02:00
parent 4ad118c613
commit b22d785c18
18 changed files with 497 additions and 469 deletions
--- a/pbs-api-types/src/tape/device.rs
+++ b/pbs-api-types/src/tape/device.rs
@ -3,23 +3,23 @@ use ::serde::{Deserialize, Serialize};
 use proxmox_schema::api;

 #[api()]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 /// Optional Device Identification Attributes
 pub struct OptionalDeviceIdentification {
    /// Vendor (autodetected)
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub vendor: Option<String>,
    /// Model (autodetected)
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub model: Option<String>,
    /// Serial number (autodetected)
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub serial: Option<String>,
 }

 #[api()]
-#[derive(Debug,Serialize,Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 /// Kind of device
 pub enum DeviceKind {
@ -36,7 +36,7 @@ pub enum DeviceKind {
        },
    },
 )]
-#[derive(Debug,Serialize,Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 /// Tape device information
 pub struct TapeDeviceInfo {
    pub kind: DeviceKind,
--- a/pbs-api-types/src/tape/drive.rs
+++ b/pbs-api-types/src/tape/drive.rs
@ -4,13 +4,9 @@ use std::convert::TryFrom;
 use anyhow::{bail, Error};
 use serde::{Deserialize, Serialize};

-use proxmox_schema::{api, Schema, IntegerSchema, StringSchema, Updater};
+use proxmox_schema::{api, IntegerSchema, Schema, StringSchema, Updater};

-use crate::{
-    PROXMOX_SAFE_ID_FORMAT,
-    CHANGER_NAME_SCHEMA,
-    OptionalDeviceIdentification,
-};
+use crate::{OptionalDeviceIdentification, CHANGER_NAME_SCHEMA, PROXMOX_SAFE_ID_FORMAT};

 pub const DRIVE_NAME_SCHEMA: Schema = StringSchema::new("Drive Identifier.")
    .format(&PROXMOX_SAFE_ID_FORMAT)
@ -18,16 +14,15 @@ pub const DRIVE_NAME_SCHEMA: Schema = StringSchema::new("Drive Identifier.")
    .max_length(32)
    .schema();

-pub const LTO_DRIVE_PATH_SCHEMA: Schema = StringSchema::new(
-    "The path to a LTO SCSI-generic tape device (i.e. '/dev/sg0')")
-    .schema();
+pub const LTO_DRIVE_PATH_SCHEMA: Schema =
+    StringSchema::new("The path to a LTO SCSI-generic tape device (i.e. '/dev/sg0')").schema();

-pub const CHANGER_DRIVENUM_SCHEMA: Schema = IntegerSchema::new(
-    "Associated changer drive number (requires option changer)")
-    .minimum(0)
-    .maximum(255)
-    .default(0)
-    .schema();
+pub const CHANGER_DRIVENUM_SCHEMA: Schema =
+    IntegerSchema::new("Associated changer drive number (requires option changer)")
+        .minimum(0)
+        .maximum(255)
+        .default(0)
+        .schema();

 #[api(
    properties: {
@ -36,7 +31,7 @@ pub const CHANGER_DRIVENUM_SCHEMA: Schema = IntegerSchema::new(
        }
    }
 )]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 /// Simulate tape drives (only for test and debug)
 #[serde(rename_all = "kebab-case")]
 pub struct VirtualTapeDrive {
@ -44,7 +39,7 @@ pub struct VirtualTapeDrive {
    /// Path to directory
    pub path: String,
    /// Virtual tape size
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub max_size: Option<usize>,
 }

@ -66,16 +61,16 @@ pub struct VirtualTapeDrive {
        },
    }
 )]
-#[derive(Serialize,Deserialize,Updater)]
+#[derive(Serialize, Deserialize, Updater)]
 #[serde(rename_all = "kebab-case")]
 /// Lto SCSI tape driver
 pub struct LtoTapeDrive {
    #[updater(skip)]
    pub name: String,
    pub path: String,
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub changer: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub changer_drivenum: Option<u64>,
 }

@ -89,7 +84,7 @@ pub struct LtoTapeDrive {
        },
    },
 )]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 /// Drive list entry
 pub struct DriveListEntry {
@ -98,12 +93,12 @@ pub struct DriveListEntry {
    #[serde(flatten)]
    pub info: OptionalDeviceIdentification,
    /// the state of the drive if locked
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub state: Option<String>,
 }

 #[api()]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 /// Medium auxiliary memory attributes (MAM)
 pub struct MamAttribute {
    /// Attribute id
@ -115,7 +110,7 @@ pub struct MamAttribute {
 }

 #[api()]
-#[derive(Serialize,Deserialize,Copy,Clone,Debug)]
+#[derive(Serialize, Deserialize, Copy, Clone, Debug)]
 pub enum TapeDensity {
    /// Unknown (no media loaded)
    Unknown,
@ -168,7 +163,7 @@ impl TryFrom<u8> for TapeDensity {
        },
    },
 )]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 /// Drive/Media status for Lto SCSI drives.
 ///
@ -190,35 +185,35 @@ pub struct LtoDriveAndMediaStatus {
    /// Tape density
    pub density: TapeDensity,
    /// Media is write protected
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub write_protect: Option<bool>,
    /// Tape Alert Flags
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub alert_flags: Option<String>,
    /// Current file number
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub file_number: Option<u64>,
    /// Current block number
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub block_number: Option<u64>,
    /// Medium Manufacture Date (epoch)
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub manufactured: Option<i64>,
    /// Total Bytes Read in Medium Life
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub bytes_read: Option<u64>,
    /// Total Bytes Written in Medium Life
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub bytes_written: Option<u64>,
    /// Number of mounts for the current volume (i.e., Thread Count)
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub volume_mounts: Option<u64>,
    /// Count of the total number of times the medium has passed over
    /// the head.
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub medium_passes: Option<u64>,
    /// Estimated tape wearout factor (assuming max. 16000 end-to-end passes)
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub medium_wearout: Option<f64>,
 }

--- a/pbs-api-types/src/tape/media.rs
+++ b/pbs-api-types/src/tape/media.rs
@ -3,19 +3,15 @@ use ::serde::{Deserialize, Serialize};
 use proxmox_schema::*;
 use proxmox_uuid::Uuid;

-use crate::{
-    UUID_FORMAT,
-    MediaStatus,
-    MediaLocation,
-};
+use crate::{MediaLocation, MediaStatus, UUID_FORMAT};

-pub const MEDIA_SET_UUID_SCHEMA: Schema =
-    StringSchema::new("MediaSet Uuid (We use the all-zero Uuid to reseve an empty media for a specific pool).")
-    .format(&UUID_FORMAT)
-    .schema();
+pub const MEDIA_SET_UUID_SCHEMA: Schema = StringSchema::new(
+    "MediaSet Uuid (We use the all-zero Uuid to reseve an empty media for a specific pool).",
+)
+.format(&UUID_FORMAT)
+.schema();

-pub const MEDIA_UUID_SCHEMA: Schema =
-    StringSchema::new("Media Uuid.")
+pub const MEDIA_UUID_SCHEMA: Schema = StringSchema::new("Media Uuid.")
    .format(&UUID_FORMAT)
    .schema();

@ -26,7 +22,7 @@ pub const MEDIA_UUID_SCHEMA: Schema =
        },
    },
 )]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 /// Media Set list entry
 pub struct MediaSetListEntry {
@ -56,7 +52,7 @@ pub struct MediaSetListEntry {
        },
    },
 )]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 /// Media list entry
 pub struct MediaListEntry {
@ -72,18 +68,18 @@ pub struct MediaListEntry {
    /// Catalog status OK
    pub catalog: bool,
    /// Media set name
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub media_set_name: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub media_set_uuid: Option<Uuid>,
    /// Media set seq_nr
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub seq_nr: Option<u64>,
    /// MediaSet creation time stamp
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub media_set_ctime: Option<i64>,
    /// Media Pool
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub pool: Option<String>,
 }

@ -98,7 +94,7 @@ pub struct MediaListEntry {
        },
    },
 )]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 /// Media label info
 pub struct MediaIdFlat {
@ -110,18 +106,18 @@ pub struct MediaIdFlat {
    pub ctime: i64,
    // All MediaSet properties are optional here
    /// MediaSet Pool
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub pool: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub media_set_uuid: Option<Uuid>,
    /// MediaSet media sequence number
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub seq_nr: Option<u64>,
    /// MediaSet Creation time stamp
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub media_set_ctime: Option<i64>,
    /// Encryption key fingerprint
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub encryption_key_fingerprint: Option<String>,
 }

@ -133,7 +129,7 @@ pub struct MediaIdFlat {
        },
    },
 )]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 /// Label with optional Uuid
 pub struct LabelUuidMap {
@ -153,7 +149,7 @@ pub struct LabelUuidMap {
        },
    },
 )]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 /// Media content list entry
 pub struct MediaContentEntry {
--- a/pbs-api-types/src/tape/media_pool.rs
+++ b/pbs-api-types/src/tape/media_pool.rs
@ -9,14 +9,12 @@ use std::str::FromStr;
 use anyhow::Error;
 use serde::{Deserialize, Serialize};

-use proxmox_schema::{api, Schema, StringSchema, ApiStringFormat, Updater};
+use proxmox_schema::{api, ApiStringFormat, Schema, StringSchema, Updater};

 use proxmox_time::{CalendarEvent, TimeSpan};

 use crate::{
-    PROXMOX_SAFE_ID_FORMAT,
-    SINGLE_LINE_COMMENT_FORMAT,
-    SINGLE_LINE_COMMENT_SCHEMA,
+    PROXMOX_SAFE_ID_FORMAT, SINGLE_LINE_COMMENT_FORMAT, SINGLE_LINE_COMMENT_SCHEMA,
    TAPE_ENCRYPTION_KEY_FINGERPRINT_SCHEMA,
 };

@ -27,19 +25,22 @@ pub const MEDIA_POOL_NAME_SCHEMA: Schema = StringSchema::new("Media pool name.")
    .schema();

 pub const MEDIA_SET_NAMING_TEMPLATE_SCHEMA: Schema = StringSchema::new(
-    "Media set naming template (may contain strftime() time format specifications).")
-    .format(&SINGLE_LINE_COMMENT_FORMAT)
-    .min_length(2)
-    .max_length(64)
-    .schema();
+    "Media set naming template (may contain strftime() time format specifications).",
+)
+.format(&SINGLE_LINE_COMMENT_FORMAT)
+.min_length(2)
+.max_length(64)
+.schema();

-pub const MEDIA_SET_ALLOCATION_POLICY_FORMAT: ApiStringFormat =
-    ApiStringFormat::VerifyFn(|s| { MediaSetPolicy::from_str(s)?; Ok(()) });
+pub const MEDIA_SET_ALLOCATION_POLICY_FORMAT: ApiStringFormat = ApiStringFormat::VerifyFn(|s| {
+    MediaSetPolicy::from_str(s)?;
+    Ok(())
+});

-pub const MEDIA_SET_ALLOCATION_POLICY_SCHEMA: Schema = StringSchema::new(
-    "Media set allocation policy ('continue', 'always', or a calendar event).")
-    .format(&MEDIA_SET_ALLOCATION_POLICY_FORMAT)
-    .schema();
+pub const MEDIA_SET_ALLOCATION_POLICY_SCHEMA: Schema =
+    StringSchema::new("Media set allocation policy ('continue', 'always', or a calendar event).")
+        .format(&MEDIA_SET_ALLOCATION_POLICY_FORMAT)
+        .schema();

 /// Media set allocation policy
 pub enum MediaSetPolicy {
@ -68,13 +69,15 @@ impl std::str::FromStr for MediaSetPolicy {
    }
 }

-pub const MEDIA_RETENTION_POLICY_FORMAT: ApiStringFormat =
-    ApiStringFormat::VerifyFn(|s| { RetentionPolicy::from_str(s)?; Ok(()) });
+pub const MEDIA_RETENTION_POLICY_FORMAT: ApiStringFormat = ApiStringFormat::VerifyFn(|s| {
+    RetentionPolicy::from_str(s)?;
+    Ok(())
+});

-pub const MEDIA_RETENTION_POLICY_SCHEMA: Schema = StringSchema::new(
-    "Media retention policy ('overwrite', 'keep', or time span).")
-    .format(&MEDIA_RETENTION_POLICY_FORMAT)
-    .schema();
+pub const MEDIA_RETENTION_POLICY_SCHEMA: Schema =
+    StringSchema::new("Media retention policy ('overwrite', 'keep', or time span).")
+        .format(&MEDIA_RETENTION_POLICY_FORMAT)
+        .schema();

 /// Media retention Policy
 pub enum RetentionPolicy {
@ -130,29 +133,29 @@ impl std::str::FromStr for RetentionPolicy {
        },
    },
 )]
-#[derive(Serialize,Deserialize,Updater)]
+#[derive(Serialize, Deserialize, Updater)]
 /// Media pool configuration
 pub struct MediaPoolConfig {
    /// The pool name
    #[updater(skip)]
    pub name: String,
    /// Media Set allocation policy
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub allocation: Option<String>,
    /// Media retention policy
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub retention: Option<String>,
    /// Media set naming template (default "%c")
    ///
    /// The template is UTF8 text, and can include strftime time
    /// format specifications.
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub template: Option<String>,
    /// Encryption key fingerprint
    ///
    /// If set, encrypt all data using the specified key.
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub encrypt: Option<String>,
-    #[serde(skip_serializing_if="Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub comment: Option<String>,
 }
--- a/pbs-api-types/src/tape/mod.rs
+++ b/pbs-api-types/src/tape/mod.rs
@ -24,31 +24,28 @@ pub use media::*;

 use serde::{Deserialize, Serialize};

-use proxmox_schema::{api, const_regex, Schema, StringSchema, ApiStringFormat};
+use proxmox_schema::{api, const_regex, ApiStringFormat, Schema, StringSchema};
 use proxmox_uuid::Uuid;

-use crate::{
-    FINGERPRINT_SHA256_FORMAT, BACKUP_ID_SCHEMA, BACKUP_TYPE_SCHEMA,
-};
+use crate::{BACKUP_ID_SCHEMA, BACKUP_TYPE_SCHEMA, FINGERPRINT_SHA256_FORMAT};

-const_regex!{
+const_regex! {
    pub TAPE_RESTORE_SNAPSHOT_REGEX = concat!(r"^", PROXMOX_SAFE_ID_REGEX_STR!(), r":", SNAPSHOT_PATH_REGEX_STR!(), r"$");
 }

 pub const TAPE_RESTORE_SNAPSHOT_FORMAT: ApiStringFormat =
    ApiStringFormat::Pattern(&TAPE_RESTORE_SNAPSHOT_REGEX);

-pub const TAPE_ENCRYPTION_KEY_FINGERPRINT_SCHEMA: Schema = StringSchema::new(
-    "Tape encryption key fingerprint (sha256)."
-)
-    .format(&FINGERPRINT_SHA256_FORMAT)
-    .schema();
+pub const TAPE_ENCRYPTION_KEY_FINGERPRINT_SCHEMA: Schema =
+    StringSchema::new("Tape encryption key fingerprint (sha256).")
+        .format(&FINGERPRINT_SHA256_FORMAT)
+        .schema();

-pub const TAPE_RESTORE_SNAPSHOT_SCHEMA: Schema = StringSchema::new(
-    "A snapshot in the format: 'store:type/id/time")
-    .format(&TAPE_RESTORE_SNAPSHOT_FORMAT)
-    .type_text("store:type/id/time")
-    .schema();
+pub const TAPE_RESTORE_SNAPSHOT_SCHEMA: Schema =
+    StringSchema::new("A snapshot in the format: 'store:type/id/time")
+        .format(&TAPE_RESTORE_SNAPSHOT_FORMAT)
+        .type_text("store:type/id/time")
+        .schema();

 #[api(
    properties: {
@ -78,8 +75,8 @@ pub const TAPE_RESTORE_SNAPSHOT_SCHEMA: Schema = StringSchema::new(
        },
    },
 )]
-#[derive(Serialize,Deserialize)]
-#[serde(rename_all="kebab-case")]
+#[derive(Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
 /// Content list filter parameters
 pub struct MediaContentListFilter {
    pub pool: Option<String>,