disks: Deref disks for simplicity

Signed-off-by: Ikey Doherty <[email protected]>

Author: ikeycode

crates/disks/src/lib.rs

@@ -77,32 +77,32 @@ impl Disk {
     /// Returns the name of the disk device.
     pub fn name(&self) -> &str {
         match self {
-            Disk::Scsi(disk) => &disk.disk.name,
-            Disk::Nvme(disk) => &disk.disk.name,
+            Disk::Scsi(disk) => &disk.name,
+            Disk::Nvme(disk) => &disk.name,
         }
     }
 
     /// Returns the partitions on the disk.
     pub fn partitions(&self) -> &[Partition] {
         match self {
-            Disk::Scsi(disk) => &disk.disk.partitions,
-            Disk::Nvme(disk) => &disk.disk.partitions,
+            Disk::Scsi(disk) => &disk.partitions,
+            Disk::Nvme(disk) => &disk.partitions,
         }
     }
 
     /// Returns the path to the disk device in dev.
     pub fn device_path(&self) -> &Path {
         match self {
-            Disk::Scsi(disk) => &disk.disk.device,
-            Disk::Nvme(disk) => &disk.disk.device,
+            Disk::Scsi(disk) => &disk.device,
+            Disk::Nvme(disk) => &disk.device,
         }
     }
 
     /// Returns the total number of sectors on the disk.
     pub fn sectors(&self) -> u64 {
         match self {
-            Disk::Scsi(disk) => disk.disk.sectors,
-            Disk::Nvme(disk) => disk.disk.sectors,
+            Disk::Scsi(disk) => disk.sectors,
+            Disk::Nvme(disk) => disk.sectors,
         }
     }
 
@@ -114,16 +114,16 @@ impl Disk {
     /// Returns the model name of the disk.
     pub fn model(&self) -> Option<&str> {
         match self {
-            Disk::Scsi(disk) => disk.disk.model.as_deref(),
-            Disk::Nvme(disk) => disk.disk.model.as_deref(),
+            Disk::Scsi(disk) => disk.model.as_deref(),
+            Disk::Nvme(disk) => disk.model.as_deref(),
         }
     }
 
     /// Returns the vendor name of the disk.
     pub fn vendor(&self) -> Option<&str> {
         match self {
-            Disk::Scsi(disk) => disk.disk.vendor.as_deref(),
-            Disk::Nvme(disk) => disk.disk.vendor.as_deref(),
+            Disk::Scsi(disk) => disk.vendor.as_deref(),
+            Disk::Nvme(disk) => disk.vendor.as_deref(),
         }
     }
 }

crates/disks/src/nvme.rs

@@ -9,16 +9,21 @@
 
 use crate::{BasicDisk, DiskInit};
 use regex::Regex;
-use std::{path::Path, sync::OnceLock};
+use std::{ops::Deref, path::Path, sync::OnceLock};
 
 /// Regex pattern to match valid NVMe device names (e.g. nvme0n1)
 static NVME_PATTERN: OnceLock<Regex> = OnceLock::new();
 
 /// Represents an NVMe disk device
 #[derive(Debug)]
-pub struct Disk {
-    /// The underlying basic disk implementation
-    pub(crate) disk: BasicDisk,
+pub struct Disk(pub BasicDisk);
+
+impl Deref for Disk {
+    type Target = BasicDisk;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
 }
 
 impl DiskInit for Disk {
@@ -35,9 +40,7 @@ impl DiskInit for Disk {
         let regex = NVME_PATTERN
             .get_or_init(|| Regex::new(r"^nvme\d+n\d+$").expect("Failed to initialise known-working regex"));
         if regex.is_match(name) {
-            Some(Self {
-                disk: BasicDisk::from_sysfs_path(sysroot, name)?,
-            })
+            Some(Self(BasicDisk::from_sysfs_path(sysroot, name)?))
         } else {
             None
         }

crates/disks/src/scsi.rs

@@ -8,16 +8,22 @@
 //! the SCSI subsystem. This module handles enumeration and management of these devices,
 //! which appear as `/dev/sd*` block devices.
 
-use std::path::Path;
+use std::{ops::Deref, path::Path};
 
 use crate::{BasicDisk, DiskInit};
 
 /// Represents a SCSI disk device.
 ///
 /// This struct wraps a BasicDisk to provide SCSI-specific functionality.
 #[derive(Debug)]
-pub struct Disk {
-    pub(crate) disk: BasicDisk,
+pub struct Disk(pub BasicDisk);
+
+impl Deref for Disk {
+    type Target = BasicDisk;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
 }
 
 impl DiskInit for Disk {
@@ -35,9 +41,7 @@ impl DiskInit for Disk {
     fn from_sysfs_path(sysroot: &Path, name: &str) -> Option<Self> {
         let matching = name.starts_with("sd") && name[2..].chars().all(char::is_alphabetic);
         if matching {
-            Some(Self {
-                disk: BasicDisk::from_sysfs_path(sysroot, name)?,
-            })
+            Some(Self(BasicDisk::from_sysfs_path(sysroot, name)?))
         } else {
             None
         }