Fix conflicts

crates/provider/src/native.rs

@@ -4,18 +4,15 @@ use std::{
         hash_map::Entry::{Occupied, Vacant},
         HashMap,
     },
-    error::Error,
     fmt::Debug,
-    io::ErrorKind,
     path::{Path, PathBuf},
-    process::Stdio,
 };
 
 use async_trait::async_trait;
 use serde::Serialize;
 use support::fs::FileSystem;
 use tokio::{
-    process::{Child, Command},
+    process::Command,
     time::{sleep, Duration},
 };
 

crates/support/src/fs/mock.rs

@@ -28,7 +28,7 @@ pub enum MockError {
     #[error(transparent)]
     Other(#[from] Box<dyn std::error::Error + Sync + Send + 'static>),
 }
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct MockFilesystem {
     copy_error:        Option<MockError>, // Option<Box<dyn Error + Send + Sync>>,
     create_dir_error:  Option<MockError>, // Option<Box<dyn Error + Send + Sync>>,
@@ -39,12 +39,6 @@ pub struct MockFilesystem {
     pub operations:    Vec<Operation>,
 }
 
-impl Default for MockFilesystem {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl MockFilesystem {
     pub fn new() -> Self {
         Self::default()