holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make use of interruptible stream in various places

Browse Source
This commit is contained in:
Jason Gedge
2020-03-29 12:30:36 -04:00
committed by Jason Gedge
parent 2a54ee0c54
commit 35dc7438a5
2 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/nu-cli/src/shell/filesystem_shell.rs
View File

@ -16,7 +16,6 @@ use rustyline::completion::FilenameCompleter;
use rustyline::hint::{Hinter, HistoryHinter};
use std::collections::HashMap;
use std::path::{Component, Path, PathBuf};
use std::sync::atomic::Ordering;
use trash as SendToTrash;
#[cfg(unix)]
@ -163,10 +162,6 @@ impl Shell for FilesystemShell {
// Generated stream: impl Stream<Item = Result<ReturnSuccess, ShellError>
let stream = async_stream::try_stream! {
for path in paths {
if ctrl_c.load(Ordering::SeqCst) {
break;
}
let path = path.map_err(|e| ShellError::from(e.into_error()))?;
if !all && is_hidden_dir(&path) {
@ -196,7 +191,7 @@ impl Shell for FilesystemShell {
}
};
Ok(stream.to_output_stream())
Ok(stream.interruptible(ctrl_c).to_output_stream())
}
fn cd(&self, args: EvaluatedWholeStreamCommandArgs) -> Result<OutputStream, ShellError> {