tape: further hierarchy improvements

src/api2/config/changer.rs

@@ -21,7 +21,7 @@ use crate::{
         ScsiTapeChanger,
         LinuxTapeDrive,
     },
-    tape::drive::{
+    tape::{
         linux_tape_changer_list,
         check_drive_path,
         lookup_drive,

src/api2/config/drive.rs

@@ -16,7 +16,7 @@ use crate::{
         LinuxTapeDrive,
         ScsiTapeChanger,
     },
-    tape::drive::{
+    tape::{
         linux_tape_device_list,
         check_drive_path,
         lookup_drive,

src/api2/tape/changer.rs

@@ -18,7 +18,7 @@ use crate::{
     tape::{
         TAPE_STATUS_DIR,
         Inventory,
-        drive::linux_tape_changer_list,
+        linux_tape_changer_list,
         changer::{
             OnlineStatusMap,
             ElementStatus,

src/api2/tape/drive.rs

@@ -47,7 +47,8 @@ use crate::{
         Inventory,
         MediaCatalog,
         MediaId,
-         file_formats::{
+        linux_tape_device_list,
+        file_formats::{
             MediaLabel,
             MediaSetLabel,
         },
@@ -55,8 +56,7 @@ use crate::{
             TapeDriver,
             LinuxTapeHandle,
             open_linux_tape_device,
-            linux_tape_device_list,
-            media_changer,
+             media_changer,
             required_media_changer,
             open_drive,
         },

src/bin/proxmox_tape/changer.rs

@@ -19,9 +19,9 @@ use proxmox_backup::{
         },
     },
     tape::{
+        complete_changer_path,
         drive::{
             media_changer,
-            complete_changer_path,
         },
     },
     config::{

src/bin/proxmox_tape/drive.rs

@@ -17,7 +17,7 @@ use proxmox_backup::{
             DRIVE_NAME_SCHEMA,
         },
     },
-    tape::drive::complete_drive_path,
+    tape::complete_drive_path,
     config::drive::{
         complete_drive_name,
         complete_changer_name,

src/tape/drive/mod.rs

@@ -18,9 +18,6 @@ pub use linux_tape::*;
 mod mam;
 pub use mam::*;
 
-mod linux_list_drives;
-pub use linux_list_drives::*;
-
 use anyhow::{bail, format_err, Error};
 use ::serde::{Deserialize};
 use serde_json::Value;

src/tape/mod.rs

@@ -26,6 +26,9 @@ pub use media_set::*;
 mod inventory;
 pub use inventory::*;
 
+mod linux_list_drives;
+pub use linux_list_drives::*;
+
 pub mod changer;
 
 pub mod drive;