renamed src/tape/sgutils2.rs -> src/tools/sgutils2.rs

src/tape/drive/encryption.rs

@@ -6,11 +6,9 @@ use endian_trait::Endian;
 
 use proxmox::tools::io::{ReadExt, WriteExt};
 
-use crate::{
+use crate::tools::sgutils2::{
-    tape::sgutils2::{
     SgRaw,
     alloc_page_aligned_buffer,
-    },
 };
 
 /// Test if drive supports hardware encryption

src/tape/drive/mam.rs

@@ -9,9 +9,9 @@ use proxmox::tools::io::ReadExt;
 
 use crate::{
     api2::types::MamAttribute,
+    tools::sgutils2::SgRaw,
     tape::{
         drive::TapeAlertFlags,
-        sgutils2::SgRaw,
     },
 };
 

src/tape/drive/tape_alert_flags.rs

@@ -5,11 +5,7 @@ use anyhow::{bail, format_err, Error};
 
 use proxmox::tools::io::ReadExt;
 
-use crate::{
+use crate::tools::sgutils2::SgRaw;
-    tape::{
-        sgutils2::SgRaw,
-    },
-};
 
 bitflags::bitflags!{
 

src/tape/drive/volume_statistics.rs

@@ -7,11 +7,7 @@ use endian_trait::Endian;
 
 use proxmox::tools::io::ReadExt;
 
-use crate::{
+use crate::tools::sgutils2::SgRaw;
-    tape::{
-        sgutils2::SgRaw,
-    },
-};
 
 /// SCSI command to query volume statistics
 ///

src/tape/mod.rs

@@ -7,8 +7,6 @@ use proxmox::tools::fs::{
     CreateOptions,
 };
 
-pub mod sgutils2;
-
 pub mod file_formats;
 
 mod tape_write;

src/tools.rs

@@ -42,6 +42,7 @@ pub mod systemd;
 pub mod ticket;
 pub mod xattr;
 pub mod zip;
+pub mod sgutils2;
 
 pub mod parallel_handler;
 pub use parallel_handler::ParallelHandler;