Merge pull request #2906 from jyn514/remove-dead-code

Remove dead code warning for test-only `size` field for `diskio::Item`

Author: rbtcollins

src/diskio/mod.rs

@@ -193,8 +193,6 @@ pub(crate) struct Item {
     start: Option<Instant>,
     /// Amount of time the operation took to finish
     finish: Option<Duration>,
-    /// The length of the file, for files (for stats)
-    size: Option<usize>,
     /// The result of the operation (could now be factored into CompletedIO...)
     pub(crate) result: io::Result<()>,
     /// The mode to apply
@@ -216,20 +214,17 @@ impl Item {
             kind: Kind::Directory,
             start: None,
             finish: None,
-            size: None,
             result: Ok(()),
             mode,
         }
     }
 
     pub(crate) fn write_file(full_path: PathBuf, mode: u32, content: FileBuffer) -> Self {
-        let len = content.len();
         Self {
             full_path,
             kind: Kind::File(content),
             start: None,
             finish: None,
-            size: Some(len),
             result: Ok(()),
             mode,
         }
@@ -246,7 +241,6 @@ impl Item {
             kind: Kind::IncrementalFile(content_callback),
             start: None,
             finish: None,
-            size: None,
             result: Ok(()),
             mode,
         };

src/diskio/test.rs

@@ -4,9 +4,19 @@ use anyhow::Result;
 
 use crate::test::test_dir;
 
-use super::{get_executor, Executor, Item};
+use super::{get_executor, Executor, Item, Kind};
 use crate::currentprocess;
 
+impl Item {
+    /// The length of the file, for files (for stats)
+    fn size(&self) -> Option<usize> {
+        match &self.kind {
+            Kind::File(buf) => Some(buf.len()),
+            _ => None,
+        }
+    }
+}
+
 fn test_incremental_file(io_threads: &str) -> Result<()> {
     let work_dir = test_dir()?;
     let mut vars = HashMap::new();
@@ -96,10 +106,10 @@ fn test_complete_file(io_threads: &str) -> Result<()> {
         assert_eq!(chunk.len(), 10);
         chunk = chunk.finished();
         let item = Item::write_file(work_dir.path().join("scratch"), 0o666, chunk);
-        assert_eq!(item.size, Some(10));
+        assert_eq!(item.size(), Some(10));
         let mut items = 0;
         let mut check_item = |item: Item| {
-            assert_eq!(item.size, Some(10));
+            assert_eq!(item.size(), Some(10));
             items += 1;
             assert_eq!(1, items);
         };