[pbs-devel] [PATCH backup 3/4] datastore: use std::mem::ofset_of!

[Maximiliano Sandoval <m.sandoval@proxmox.com>]

Requires Rust 1.77.0.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 pbs-datastore/src/data_blob.rs     | 4 ++--
 pbs-datastore/src/dynamic_index.rs | 2 +-
 pbs-datastore/src/fixed_index.rs   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pbs-datastore/src/data_blob.rs b/pbs-datastore/src/data_blob.rs
index 4119c4a4..e3039354 100644
--- a/pbs-datastore/src/data_blob.rs
+++ b/pbs-datastore/src/data_blob.rs
@@ -56,13 +56,13 @@ impl DataBlob {
 
     /// accessor to crc32 checksum
     pub fn crc(&self) -> u32 {
-        let crc_o = proxmox_lang::offsetof!(DataBlobHeader, crc);
+        let crc_o = std::mem::offset_of!(DataBlobHeader, crc);
         u32::from_le_bytes(self.raw_data[crc_o..crc_o + 4].try_into().unwrap())
     }
 
     // set the CRC checksum field
     pub fn set_crc(&mut self, crc: u32) {
-        let crc_o = proxmox_lang::offsetof!(DataBlobHeader, crc);
+        let crc_o = std::mem::offset_of!(DataBlobHeader, crc);
         self.raw_data[crc_o..crc_o + 4].copy_from_slice(&crc.to_le_bytes());
     }
 
diff --git a/pbs-datastore/src/dynamic_index.rs b/pbs-datastore/src/dynamic_index.rs
index dc9eee05..0e99ce58 100644
--- a/pbs-datastore/src/dynamic_index.rs
+++ b/pbs-datastore/src/dynamic_index.rs
@@ -353,7 +353,7 @@ impl DynamicIndexWriter {
 
         self.writer.flush()?;
 
-        let csum_offset = proxmox_lang::offsetof!(DynamicIndexHeader, index_csum);
+        let csum_offset = std::mem::offset_of!(DynamicIndexHeader, index_csum);
         self.writer.seek(SeekFrom::Start(csum_offset as u64))?;
 
         let csum = self.csum.take().unwrap();
diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs
index 9ed943fa..d67c388e 100644
--- a/pbs-datastore/src/fixed_index.rs
+++ b/pbs-datastore/src/fixed_index.rs
@@ -349,7 +349,7 @@ impl FixedIndexWriter {
 
         self.unmap()?;
 
-        let csum_offset = proxmox_lang::offsetof!(FixedIndexHeader, index_csum);
+        let csum_offset = std::mem::offset_of!(FixedIndexHeader, index_csum);
         self.file.seek(SeekFrom::Start(csum_offset as u64))?;
         self.file.write_all(&index_csum)?;
         self.file.flush()?;
-- 
2.39.2



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel