diff --git a/crates/nu-command/src/commands/network/url_/command.rs b/crates/nu-command/src/commands/network/url_/command.rs index 1755feca65..e541912cf9 100644 --- a/crates/nu-command/src/commands/network/url_/command.rs +++ b/crates/nu-command/src/commands/network/url_/command.rs @@ -1,7 +1,7 @@ use crate::prelude::*; use nu_engine::WholeStreamCommand; use nu_errors::ShellError; -use nu_protocol::{ReturnSuccess, Signature, UntaggedValue}; +use nu_protocol::{Signature, UntaggedValue}; pub struct Url; @@ -18,10 +18,10 @@ impl WholeStreamCommand for Url { "Apply url function." } - fn run_with_actions(&self, args: CommandArgs) -> Result { - Ok(ActionStream::one(ReturnSuccess::value( + fn run(&self, args: CommandArgs) -> Result { + Ok(OutputStream::one( UntaggedValue::string(get_full_help(&Url, args.scope())).into_value(Tag::unknown()), - ))) + )) } } diff --git a/crates/nu-command/src/commands/network/url_/host.rs b/crates/nu-command/src/commands/network/url_/host.rs index 2b93487329..f146a651a6 100644 --- a/crates/nu-command/src/commands/network/url_/host.rs +++ b/crates/nu-command/src/commands/network/url_/host.rs @@ -22,7 +22,7 @@ impl WholeStreamCommand for UrlHost { "gets the host of a url" } - fn run_with_actions(&self, args: CommandArgs) -> Result { + fn run(&self, args: CommandArgs) -> Result { let rest: Vec = args.rest(0)?; let input = args.input; diff --git a/crates/nu-command/src/commands/network/url_/mod.rs b/crates/nu-command/src/commands/network/url_/mod.rs index d2a8aeccbe..082552dd1c 100644 --- a/crates/nu-command/src/commands/network/url_/mod.rs +++ b/crates/nu-command/src/commands/network/url_/mod.rs @@ -6,7 +6,7 @@ mod scheme; use crate::prelude::*; use nu_errors::ShellError; -use nu_protocol::{ColumnPath, Primitive, ReturnSuccess, ShellTypeName, UntaggedValue, Value}; +use nu_protocol::{ColumnPath, Primitive, ShellTypeName, UntaggedValue, Value}; use url::Url; pub use command::Url as UrlCommand; @@ -37,14 +37,14 @@ where Ok(v) } -fn operate(input: crate::InputStream, paths: Vec, action: &'static F) -> ActionStream +fn operate(input: crate::InputStream, paths: Vec, action: &'static F) -> OutputStream where F: Fn(&Url) -> &str + Send + Sync + 'static, { input .map(move |v| { if paths.is_empty() { - ReturnSuccess::value(handle_value(&action, &v)?) + handle_value(&action, &v) } else { let mut ret = v; @@ -55,8 +55,8 @@ where )?; } - ReturnSuccess::value(ret) + Ok(ret) } }) - .into_action_stream() + .into_input_stream() } diff --git a/crates/nu-command/src/commands/network/url_/path.rs b/crates/nu-command/src/commands/network/url_/path.rs index 8a5c4b03bf..e01aa94d35 100644 --- a/crates/nu-command/src/commands/network/url_/path.rs +++ b/crates/nu-command/src/commands/network/url_/path.rs @@ -22,7 +22,7 @@ impl WholeStreamCommand for UrlPath { "gets the path of a url" } - fn run_with_actions(&self, args: CommandArgs) -> Result { + fn run(&self, args: CommandArgs) -> Result { let rest: Vec = args.rest(0)?; let input = args.input; diff --git a/crates/nu-command/src/commands/network/url_/query.rs b/crates/nu-command/src/commands/network/url_/query.rs index 23cb4527e8..0aae49ee92 100644 --- a/crates/nu-command/src/commands/network/url_/query.rs +++ b/crates/nu-command/src/commands/network/url_/query.rs @@ -22,7 +22,7 @@ impl WholeStreamCommand for UrlQuery { "gets the query of a url" } - fn run_with_actions(&self, args: CommandArgs) -> Result { + fn run(&self, args: CommandArgs) -> Result { let rest: Vec = args.rest(0)?; let input = args.input; Ok(operate(input, rest, &query)) diff --git a/crates/nu-command/src/commands/network/url_/scheme.rs b/crates/nu-command/src/commands/network/url_/scheme.rs index 62422f7553..9c519f84ed 100644 --- a/crates/nu-command/src/commands/network/url_/scheme.rs +++ b/crates/nu-command/src/commands/network/url_/scheme.rs @@ -21,7 +21,7 @@ impl WholeStreamCommand for UrlScheme { "gets the scheme (eg http, file) of a url" } - fn run_with_actions(&self, args: CommandArgs) -> Result { + fn run(&self, args: CommandArgs) -> Result { let rest: Vec = args.rest(0)?; Ok(operate(args.input, rest, &Url::scheme)) }