diff --git a/common/src/notify.rs b/common/src/notify.rs index 02c8128..5df6611 100644 --- a/common/src/notify.rs +++ b/common/src/notify.rs @@ -3,7 +3,7 @@ mod export { use std::collections::HashMap; use std::sync::Mutex; - use anyhow::{bail, Error}; + use anyhow::{Error, bail}; use serde_json::Value as JSONValue; use perlmod::Value; @@ -27,7 +27,7 @@ mod export { CalendarMatcher, DeleteableMatcherProperty, FieldMatcher, MatchModeOperator, MatcherConfig, MatcherConfigUpdater, SeverityMatcher, }; - use proxmox_notify::{api, Config, Notification, Severity}; + use proxmox_notify::{Config, Notification, Severity, api}; pub struct NotificationConfig { config: Mutex, diff --git a/common/src/oidc/mod.rs b/common/src/oidc/mod.rs index b1cddaa..29791bc 100644 --- a/common/src/oidc/mod.rs +++ b/common/src/oidc/mod.rs @@ -4,7 +4,7 @@ pub mod export { use anyhow::Error; - use perlmod::{to_value, Value}; + use perlmod::{Value, to_value}; use proxmox_openid::{OpenIdAuthenticator, OpenIdConfig, PrivateAuthState}; diff --git a/common/src/subscription.rs b/common/src/subscription.rs index 594c778..0ee6953 100644 --- a/common/src/subscription.rs +++ b/common/src/subscription.rs @@ -1,13 +1,13 @@ #[perlmod::package(name = "Proxmox::RS::Subscription")] mod export { - use anyhow::{bail, format_err, Error}; + use anyhow::{Error, bail, format_err}; use proxmox_subscription::SubscriptionInfo; use proxmox_sys::fs::CreateOptions; - use proxmox_http::client::sync::Client; use proxmox_http::HttpOptions; use proxmox_http::ProxyConfig; + use proxmox_http::client::sync::Client; #[export] fn read_subscription(path: String) -> Result, Error> { diff --git a/pmg-rs/src/acme.rs b/pmg-rs/src/acme.rs index ca24f17..8aeaab5 100644 --- a/pmg-rs/src/acme.rs +++ b/pmg-rs/src/acme.rs @@ -2,7 +2,7 @@ //! //! The functions in here are perl bindings. -use anyhow::{format_err, Error}; +use anyhow::{Error, format_err}; use nix::sys::stat::Mode; use proxmox_sys::fs::CreateOptions; use serde::{Deserialize, Serialize}; diff --git a/pmg-rs/src/tfa.rs b/pmg-rs/src/tfa.rs index 4e9ce8f..1a26955 100644 --- a/pmg-rs/src/tfa.rs +++ b/pmg-rs/src/tfa.rs @@ -13,7 +13,7 @@ use std::os::unix::fs::OpenOptionsExt; use std::os::unix::io::{AsRawFd, RawFd}; use std::path::{Path, PathBuf}; -use anyhow::{bail, format_err, Error}; +use anyhow::{Error, bail, format_err}; use nix::errno::Errno; use nix::sys::stat::Mode; @@ -28,12 +28,12 @@ mod export { use std::convert::TryInto; use std::sync::Mutex; - use anyhow::{bail, format_err, Error}; + use anyhow::{Error, bail, format_err}; use serde_bytes::ByteBuf; use url::Url; use perlmod::Value; - use proxmox_tfa::api::{methods, TfaResult}; + use proxmox_tfa::api::{TfaResult, methods}; use super::{TfaConfig, UserAccess}; diff --git a/pve-rs/src/firewall/sdn.rs b/pve-rs/src/firewall/sdn.rs index ef4eb70..b1a698d 100644 --- a/pve-rs/src/firewall/sdn.rs +++ b/pve-rs/src/firewall/sdn.rs @@ -3,18 +3,18 @@ mod export { use std::collections::HashMap; use std::{fs, io}; - use anyhow::{bail, Context, Error}; + use anyhow::{Context, Error, bail}; use serde::Serialize; use proxmox_ve_config::{ common::Allowlist, - firewall::types::ipset::{IpsetAddress, IpsetEntry}, firewall::types::Ipset, + firewall::types::ipset::{IpsetAddress, IpsetEntry}, guest::types::Vmid, sdn::{ + VnetName, config::{RunningConfig, SdnConfig}, ipam::{Ipam, IpamJson}, - VnetName, }, }; diff --git a/pve-rs/src/resource_scheduling/static.rs b/pve-rs/src/resource_scheduling/static.rs index c47dcd3..6ad7e1f 100644 --- a/pve-rs/src/resource_scheduling/static.rs +++ b/pve-rs/src/resource_scheduling/static.rs @@ -3,7 +3,7 @@ mod export { use std::collections::HashMap; use std::sync::Mutex; - use anyhow::{bail, Error}; + use anyhow::{Error, bail}; use perlmod::Value; use proxmox_resource_scheduling::pve_static::{StaticNodeUsage, StaticServiceUsage}; diff --git a/pve-rs/src/tfa.rs b/pve-rs/src/tfa.rs index 2cd7396..f98f5cf 100644 --- a/pve-rs/src/tfa.rs +++ b/pve-rs/src/tfa.rs @@ -15,7 +15,7 @@ use std::os::unix::fs::OpenOptionsExt; use std::os::unix::io::{AsRawFd, RawFd}; use std::path::{Path, PathBuf}; -use anyhow::{bail, format_err, Error}; +use anyhow::{Error, bail, format_err}; use nix::errno::Errno; use nix::sys::stat::Mode; use serde_json::Value as JsonValue; @@ -31,12 +31,12 @@ mod export { use std::convert::TryInto; use std::sync::Mutex; - use anyhow::{bail, format_err, Error}; + use anyhow::{Error, bail, format_err}; use serde_bytes::ByteBuf; use url::Url; use perlmod::Value; - use proxmox_tfa::api::{methods, TfaResult}; + use proxmox_tfa::api::{TfaResult, methods}; use super::{TfaConfig, UserAccess};