tui, common: run rustfmt

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>
This commit is contained in:
Christoph Heiss 2023-11-03 10:49:36 +01:00 committed by Thomas Lamprecht
parent c16d6893ec
commit feea90d471
6 changed files with 18 additions and 23 deletions

View File

@ -365,4 +365,3 @@ impl Interface {
format!("{} {}", self.state.render(), self.name) format!("{} {}", self.state.render(), self.name)
} }
} }

View File

@ -1,11 +1,11 @@
use crate::SummaryOption; use crate::SummaryOption;
use proxmox_installer_common::{ use proxmox_installer_common::{
setup::LocaleInfo,
options::{ options::{
BootdiskOptions, BtrfsRaidLevel, FsType, NetworkOptions, TimezoneOptions, BootdiskOptions, BtrfsRaidLevel, FsType, NetworkOptions, PasswordOptions, TimezoneOptions,
PasswordOptions, ZfsRaidLevel, ZfsRaidLevel,
}, },
setup::LocaleInfo,
}; };
pub const FS_TYPES: &[FsType] = { pub const FS_TYPES: &[FsType] = {
@ -70,13 +70,13 @@ mod tests {
use super::*; use super::*;
use proxmox_installer_common::{ use proxmox_installer_common::{
setup::{ setup::{
Dns, Gateway, Interface, InterfaceState, IsoInfo, IsoLocations, NetworkInfo, ProductConfig, Dns, Gateway, Interface, InterfaceState, IsoInfo, IsoLocations, NetworkInfo,
ProxmoxProduct, Routes, SetupInfo, ProductConfig, ProxmoxProduct, Routes, SetupInfo,
}, },
utils::{CidrAddress, Fqdn}, utils::{CidrAddress, Fqdn},
}; };
use std::{collections::HashMap, path::PathBuf};
use std::net::{IpAddr, Ipv4Addr}; use std::net::{IpAddr, Ipv4Addr};
use std::{collections::HashMap, path::PathBuf};
fn dummy_setup_info() -> SetupInfo { fn dummy_setup_info() -> SetupInfo {
SetupInfo { SetupInfo {

View File

@ -1,17 +1,13 @@
use std::{ use std::{collections::HashMap, fmt, net::IpAddr};
collections::HashMap,
fmt,
net::IpAddr,
};
use serde::{Serialize, Serializer}; use serde::{Serialize, Serializer};
use crate::options::InstallerOptions; use crate::options::InstallerOptions;
use proxmox_installer_common::{ use proxmox_installer_common::{
options::{AdvancedBootdiskOptions, BtrfsRaidLevel, Disk, FsType, ZfsRaidLevel}, options::{AdvancedBootdiskOptions, BtrfsRaidLevel, Disk, FsType, ZfsRaidLevel},
setup::InstallZfsOption, setup::InstallZfsOption,
utils::CidrAddress, utils::CidrAddress,
}; };
/// See Proxmox::Install::Config /// See Proxmox::Install::Config
#[derive(Serialize)] #[derive(Serialize)]

View File

@ -14,13 +14,15 @@ use crate::options::FS_TYPES;
use crate::InstallerState; use crate::InstallerState;
use proxmox_installer_common::{ use proxmox_installer_common::{
disk_checks::{
check_btrfs_raid_config, check_disks_4kn_legacy_boot, check_for_duplicate_disks,
check_zfs_raid_config,
},
options::{ options::{
AdvancedBootdiskOptions, BootdiskOptions, BtrfsBootdiskOptions, Disk, AdvancedBootdiskOptions, BootdiskOptions, BtrfsBootdiskOptions, Disk, FsType,
FsType, LvmBootdiskOptions, ZfsBootdiskOptions, LvmBootdiskOptions, ZfsBootdiskOptions, ZFS_CHECKSUM_OPTIONS, ZFS_COMPRESS_OPTIONS,
ZFS_CHECKSUM_OPTIONS, ZFS_COMPRESS_OPTIONS,
}, },
setup::{BootType, ProductConfig, ProxmoxProduct}, 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 { pub struct BootdiskOptionsView {

View File

@ -5,9 +5,7 @@ use cursive::{
}; };
use super::FormView; use super::FormView;
use crate::{ use crate::{system, InstallerState};
system, InstallerState,
};
use proxmox_installer_common::{ use proxmox_installer_common::{
options::TimezoneOptions, options::TimezoneOptions,
setup::{KeyboardMapping, LocaleInfo}, setup::{KeyboardMapping, LocaleInfo},