From ae27b307b8593c652d18afd41658c43a1e68070a Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 29 Aug 2024 10:30:20 +0200 Subject: [PATCH] pve: fix use vs mod grouping Signed-off-by: Wolfgang Bumiller --- common/src/shared_cache.rs | 3 ++- pmg-rs/src/lib.rs | 8 ++++---- pve-rs/src/lib.rs | 16 ++++++++-------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/common/src/shared_cache.rs b/common/src/shared_cache.rs index ae688f6..f045521 100644 --- a/common/src/shared_cache.rs +++ b/common/src/shared_cache.rs @@ -4,10 +4,11 @@ mod export { use anyhow::Error; use nix::sys::stat::Mode; - use perlmod::Value; use serde::Deserialize; use serde_json::Value as JSONValue; + use perlmod::Value; + use proxmox_shared_cache::SharedCache; use proxmox_sys::fs::CreateOptions; diff --git a/pmg-rs/src/lib.rs b/pmg-rs/src/lib.rs index 8bac823..3db6966 100644 --- a/pmg-rs/src/lib.rs +++ b/pmg-rs/src/lib.rs @@ -1,3 +1,7 @@ +use anyhow::Error; + +use proxmox_apt_api_types::APTUpdateInfo; + #[path = "../common/src/mod.rs"] pub mod common; @@ -6,10 +10,6 @@ pub mod apt; pub mod csr; pub mod tfa; -use anyhow::Error; - -use proxmox_apt_api_types::APTUpdateInfo; - #[perlmod::package(name = "Proxmox::Lib::PMG", lib = "pmg_rs")] mod export { use crate::common; diff --git a/pve-rs/src/lib.rs b/pve-rs/src/lib.rs index 0fad753..5e47ac6 100644 --- a/pve-rs/src/lib.rs +++ b/pve-rs/src/lib.rs @@ -1,5 +1,13 @@ //! Rust library for the Proxmox VE code base. +use std::collections::HashMap; + +use anyhow::Error; +use serde_json::json; + +use proxmox_apt_api_types::APTUpdateInfo; +use proxmox_notify::{Config, Notification, Severity}; + #[path = "../common/src/mod.rs"] pub mod common; @@ -8,14 +16,6 @@ pub mod openid; pub mod resource_scheduling; pub mod tfa; -use std::collections::HashMap; - -use anyhow::Error; - -use proxmox_apt_api_types::APTUpdateInfo; -use proxmox_notify::{Config, Notification, Severity}; -use serde_json::json; - #[perlmod::package(name = "Proxmox::Lib::PVE", lib = "pve_rs")] mod export { use proxmox_notify::context::pve::PVE_CONTEXT;