mock: Add Debug impls to a bunch of bits

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>

Author: kinnison

tests/mock/dist.rs

@@ -82,15 +82,15 @@ pub struct MockChannel {
 }
 
 // A single rust-installer package
-#[derive(Hash, Eq, PartialEq)]
+#[derive(Debug, Hash, Eq, PartialEq)]
 pub struct MockPackage {
     // rust, rustc, rust-std-$triple, rust-doc, etc.
     pub name: &'static str,
     pub version: String,
     pub targets: Vec<MockTargetedPackage>,
 }
 
-#[derive(Hash, Eq, PartialEq, Clone)]
+#[derive(Debug, Hash, Eq, PartialEq, Clone)]
 pub struct MockTargetedPackage {
     // Target triple
     pub target: String,
@@ -101,7 +101,7 @@ pub struct MockTargetedPackage {
     pub installer: MockInstallerBuilder,
 }
 
-#[derive(PartialEq, Eq, Hash, Clone)]
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
 pub struct MockComponent {
     pub name: String,
     pub target: String,

tests/mock/mod.rs

@@ -12,24 +12,24 @@ use std::path::Path;
 use std::sync::Arc;
 
 // Mock of the on-disk structure of rust-installer installers
-#[derive(PartialEq, Eq, Hash, Clone)]
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
 pub struct MockInstallerBuilder {
     pub components: Vec<MockComponentBuilder>,
 }
 
-#[derive(PartialEq, Eq, Hash, Clone)]
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
 pub struct MockComponentBuilder {
     pub name: String,
     pub files: Vec<MockFile>,
 }
 
-#[derive(PartialEq, Eq, Hash, Clone)]
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
 pub struct MockFile {
     path: String,
     contents: Contents,
 }
 
-#[derive(PartialEq, Eq, Hash, Clone)]
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
 enum Contents {
     File(MockContents),
     Dir(Vec<(&'static str, MockContents)>),
@@ -41,6 +41,15 @@ struct MockContents {
     executable: bool,
 }
 
+impl std::fmt::Debug for MockContents {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        f.debug_struct("MockContents")
+            .field("content_len", &self.contents.len())
+            .field("executable", &self.executable)
+            .finish()
+    }
+}
+
 impl MockInstallerBuilder {
     pub fn build(&self, path: &Path) {
         for component in &self.components {