From d60d71a6973e413d9a5e27a05dabe5175cda0a5a Mon Sep 17 00:00:00 2001
From: Sam Bordo <47604563+sambordo1@users.noreply.github.com>
Date: Mon, 14 Jun 2021 14:57:21 -0400
Subject: [PATCH] Begin porting mkdir (#3607)

* Begin porting mkdir

* Addressed comments
---
 crates/nu-command/src/commands/mkdir.rs             | 4 ++--
 crates/nu-engine/src/filesystem/filesystem_shell.rs | 4 ++--
 crates/nu-engine/src/shell/mod.rs                   | 2 +-
 crates/nu-engine/src/shell/shell_manager.rs         | 2 +-
 crates/nu-engine/src/shell/value_shell.rs           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/nu-command/src/commands/mkdir.rs b/crates/nu-command/src/commands/mkdir.rs
index 55770f62ac..d1db44b7a8 100644
--- a/crates/nu-command/src/commands/mkdir.rs
+++ b/crates/nu-command/src/commands/mkdir.rs
@@ -22,7 +22,7 @@ impl WholeStreamCommand for Mkdir {
         "Make directories, creates intermediary directories as required."
     }
 
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
+    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
         mkdir(args)
     }
 
@@ -35,7 +35,7 @@ impl WholeStreamCommand for Mkdir {
     }
 }
 
-fn mkdir(args: CommandArgs) -> Result<ActionStream, ShellError> {
+fn mkdir(args: CommandArgs) -> Result<OutputStream, ShellError> {
     let name = args.call_info.name_tag.clone();
     let shell_manager = args.shell_manager();
 
diff --git a/crates/nu-engine/src/filesystem/filesystem_shell.rs b/crates/nu-engine/src/filesystem/filesystem_shell.rs
index 705e1da5a4..3f1d0a1bd6 100644
--- a/crates/nu-engine/src/filesystem/filesystem_shell.rs
+++ b/crates/nu-engine/src/filesystem/filesystem_shell.rs
@@ -479,7 +479,7 @@ impl Shell for FilesystemShell {
         }: MkdirArgs,
         name: Tag,
         path: &str,
-    ) -> Result<ActionStream, ShellError> {
+    ) -> Result<OutputStream, ShellError> {
         let path = Path::new(path);
         let mut stream = VecDeque::new();
 
@@ -504,7 +504,7 @@ impl Shell for FilesystemShell {
             }
             if show_created_paths {
                 let val = format!("{:}", create_at.to_string_lossy()).into();
-                stream.push_back(Ok(ReturnSuccess::Value(val)));
+                stream.push_back(val);
             }
         }
 
diff --git a/crates/nu-engine/src/shell/mod.rs b/crates/nu-engine/src/shell/mod.rs
index d19189cfcd..98c11c77d5 100644
--- a/crates/nu-engine/src/shell/mod.rs
+++ b/crates/nu-engine/src/shell/mod.rs
@@ -29,7 +29,7 @@ pub trait Shell: std::fmt::Debug {
     ) -> Result<ActionStream, ShellError>;
     fn cd(&self, args: CdArgs, name: Tag) -> Result<ActionStream, ShellError>;
     fn cp(&self, args: CopyArgs, name: Tag, path: &str) -> Result<ActionStream, ShellError>;
-    fn mkdir(&self, args: MkdirArgs, name: Tag, path: &str) -> Result<ActionStream, ShellError>;
+    fn mkdir(&self, args: MkdirArgs, name: Tag, path: &str) -> Result<OutputStream, ShellError>;
     fn mv(&self, args: MvArgs, name: Tag, path: &str) -> Result<ActionStream, ShellError>;
     fn rm(&self, args: RemoveArgs, name: Tag, path: &str) -> Result<ActionStream, ShellError>;
     fn path(&self) -> String;
diff --git a/crates/nu-engine/src/shell/shell_manager.rs b/crates/nu-engine/src/shell/shell_manager.rs
index 7511f194a2..d985f18339 100644
--- a/crates/nu-engine/src/shell/shell_manager.rs
+++ b/crates/nu-engine/src/shell/shell_manager.rs
@@ -172,7 +172,7 @@ impl ShellManager {
         shells[self.current_shell()].rm(args, name, &path)
     }
 
-    pub fn mkdir(&self, args: MkdirArgs, name: Tag) -> Result<ActionStream, ShellError> {
+    pub fn mkdir(&self, args: MkdirArgs, name: Tag) -> Result<OutputStream, ShellError> {
         let shells = self.shells.lock();
 
         let path = shells[self.current_shell()].path();
diff --git a/crates/nu-engine/src/shell/value_shell.rs b/crates/nu-engine/src/shell/value_shell.rs
index 81e95fec0b..af5c65cc66 100644
--- a/crates/nu-engine/src/shell/value_shell.rs
+++ b/crates/nu-engine/src/shell/value_shell.rs
@@ -197,7 +197,7 @@ impl Shell for ValueShell {
         ))
     }
 
-    fn mkdir(&self, _args: MkdirArgs, name: Tag, _path: &str) -> Result<ActionStream, ShellError> {
+    fn mkdir(&self, _args: MkdirArgs, name: Tag, _path: &str) -> Result<OutputStream, ShellError> {
         Err(ShellError::labeled_error(
             "mkdir not currently supported on values",
             "not currently supported",