all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer 1/2] tui, common: run rustfmt
Date: Fri,  3 Nov 2023 10:49:36 +0100	[thread overview]
Message-ID: <20231103095016.286953-2-c.heiss@proxmox.com> (raw)
In-Reply-To: <20231103095016.286953-1-c.heiss@proxmox.com>

While at it, move rustfmt.toml to the repo root, to share it with the
other crate.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 proxmox-installer-common/src/setup.rs              |  1 -
 proxmox-tui-installer/src/options.rs               | 12 ++++++------
 proxmox-tui-installer/src/setup.rs                 | 14 +++++---------
 proxmox-tui-installer/src/views/bootdisk.rs        | 10 ++++++----
 proxmox-tui-installer/src/views/timezone.rs        |  4 +---
 proxmox-tui-installer/rustfmt.toml => rustfmt.toml |  0
 6 files changed, 18 insertions(+), 23 deletions(-)
 rename proxmox-tui-installer/rustfmt.toml => rustfmt.toml (100%)

diff --git a/proxmox-installer-common/src/setup.rs b/proxmox-installer-common/src/setup.rs
index 3ef05ae..42a9e68 100644
--- a/proxmox-installer-common/src/setup.rs
+++ b/proxmox-installer-common/src/setup.rs
@@ -365,4 +365,3 @@ impl Interface {
         format!("{} {}", self.state.render(), self.name)
     }
 }
-
diff --git a/proxmox-tui-installer/src/options.rs b/proxmox-tui-installer/src/options.rs
index 221ad01..8ea7043 100644
--- a/proxmox-tui-installer/src/options.rs
+++ b/proxmox-tui-installer/src/options.rs
@@ -1,11 +1,11 @@
 use crate::SummaryOption;
 
 use proxmox_installer_common::{
-    setup::LocaleInfo,
     options::{
-        BootdiskOptions, BtrfsRaidLevel, FsType, NetworkOptions, TimezoneOptions,
-        PasswordOptions, ZfsRaidLevel,
+        BootdiskOptions, BtrfsRaidLevel, FsType, NetworkOptions, PasswordOptions, TimezoneOptions,
+        ZfsRaidLevel,
     },
+    setup::LocaleInfo,
 };
 
 pub const FS_TYPES: &[FsType] = {
@@ -70,13 +70,13 @@ mod tests {
     use super::*;
     use proxmox_installer_common::{
         setup::{
-            Dns, Gateway, Interface, InterfaceState, IsoInfo, IsoLocations, NetworkInfo, ProductConfig,
-            ProxmoxProduct, Routes, SetupInfo,
+            Dns, Gateway, Interface, InterfaceState, IsoInfo, IsoLocations, NetworkInfo,
+            ProductConfig, ProxmoxProduct, Routes, SetupInfo,
         },
         utils::{CidrAddress, Fqdn},
     };
-    use std::{collections::HashMap, path::PathBuf};
     use std::net::{IpAddr, Ipv4Addr};
+    use std::{collections::HashMap, path::PathBuf};
 
     fn dummy_setup_info() -> SetupInfo {
         SetupInfo {
diff --git a/proxmox-tui-installer/src/setup.rs b/proxmox-tui-installer/src/setup.rs
index efcabed..79421d7 100644
--- a/proxmox-tui-installer/src/setup.rs
+++ b/proxmox-tui-installer/src/setup.rs
@@ -1,17 +1,13 @@
-use std::{
-    collections::HashMap,
-    fmt,
-    net::IpAddr,
-};
+use std::{collections::HashMap, fmt, net::IpAddr};
 
 use serde::{Serialize, Serializer};
 
 use crate::options::InstallerOptions;
 use proxmox_installer_common::{
-        options::{AdvancedBootdiskOptions, BtrfsRaidLevel, Disk, FsType, ZfsRaidLevel},
-        setup::InstallZfsOption,
-        utils::CidrAddress,
-    };
+    options::{AdvancedBootdiskOptions, BtrfsRaidLevel, Disk, FsType, ZfsRaidLevel},
+    setup::InstallZfsOption,
+    utils::CidrAddress,
+};
 
 /// See Proxmox::Install::Config
 #[derive(Serialize)]
diff --git a/proxmox-tui-installer/src/views/bootdisk.rs b/proxmox-tui-installer/src/views/bootdisk.rs
index 38a6521..7cc7678 100644
--- a/proxmox-tui-installer/src/views/bootdisk.rs
+++ b/proxmox-tui-installer/src/views/bootdisk.rs
@@ -14,13 +14,15 @@ use crate::options::FS_TYPES;
 use crate::InstallerState;
 
 use proxmox_installer_common::{
+    disk_checks::{
+        check_btrfs_raid_config, check_disks_4kn_legacy_boot, check_for_duplicate_disks,
+        check_zfs_raid_config,
+    },
     options::{
-        AdvancedBootdiskOptions, BootdiskOptions, BtrfsBootdiskOptions, Disk,
-        FsType, LvmBootdiskOptions, ZfsBootdiskOptions,
-        ZFS_CHECKSUM_OPTIONS, ZFS_COMPRESS_OPTIONS,
+        AdvancedBootdiskOptions, BootdiskOptions, BtrfsBootdiskOptions, Disk, FsType,
+        LvmBootdiskOptions, ZfsBootdiskOptions, ZFS_CHECKSUM_OPTIONS, ZFS_COMPRESS_OPTIONS,
     },
     setup::{BootType, ProductConfig, ProxmoxProduct},
-    disk_checks::{check_btrfs_raid_config, check_for_duplicate_disks, check_disks_4kn_legacy_boot, check_zfs_raid_config},
 };
 
 pub struct BootdiskOptionsView {
diff --git a/proxmox-tui-installer/src/views/timezone.rs b/proxmox-tui-installer/src/views/timezone.rs
index 77fbb10..deda600 100644
--- a/proxmox-tui-installer/src/views/timezone.rs
+++ b/proxmox-tui-installer/src/views/timezone.rs
@@ -5,9 +5,7 @@ use cursive::{
 };
 
 use super::FormView;
-use crate::{
-    system, InstallerState,
-};
+use crate::{system, InstallerState};
 use proxmox_installer_common::{
     options::TimezoneOptions,
     setup::{KeyboardMapping, LocaleInfo},
diff --git a/proxmox-tui-installer/rustfmt.toml b/rustfmt.toml
similarity index 100%
rename from proxmox-tui-installer/rustfmt.toml
rename to rustfmt.toml
-- 
2.42.0





  reply	other threads:[~2023-11-03  9:50 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-03  9:49 [pve-devel] [PATCH installer 0/2] rustfmt & clippy warning fix Christoph Heiss
2023-11-03  9:49 ` Christoph Heiss [this message]
2023-11-03  9:49 ` [pve-devel] [PATCH installer 2/2] tui: fix clippy warning Christoph Heiss
2023-11-03 11:53 ` [pve-devel] applied: [PATCH installer 0/2] rustfmt & clippy warning fix Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231103095016.286953-2-c.heiss@proxmox.com \
    --to=c.heiss@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal