diff --git a/crates/nu-command/tests/commands/for_.rs b/crates/nu-command/tests/commands/for_.rs index e321a15cb..4952f8dd7 100644 --- a/crates/nu-command/tests/commands/for_.rs +++ b/crates/nu-command/tests/commands/for_.rs @@ -21,7 +21,7 @@ fn for_break_on_external_failed() { cwd: ".", r#" for i in 1..2 { - echo 1; + print 1; nu --testbin fail }"# ); diff --git a/crates/nu-command/tests/commands/loop_.rs b/crates/nu-command/tests/commands/loop_.rs index b27c3e34b..16d654224 100644 --- a/crates/nu-command/tests/commands/loop_.rs +++ b/crates/nu-command/tests/commands/loop_.rs @@ -33,7 +33,7 @@ fn loop_break_on_external_failed() { } else { $total += 1; } - echo 1; + print 1; nu --testbin fail; }"# ); diff --git a/crates/nu-command/tests/commands/open.rs b/crates/nu-command/tests/commands/open.rs index bd7652ceb..5de381e78 100644 --- a/crates/nu-command/tests/commands/open.rs +++ b/crates/nu-command/tests/commands/open.rs @@ -262,10 +262,10 @@ fn test_open_block_command() { r#" def "from blockcommandparser" [] { lines | split column ",|," } let values = (open sample.blockcommandparser) - echo ($values | get column1 | get 0) - echo ($values | get column2 | get 0) - echo ($values | get column1 | get 1) - echo ($values | get column2 | get 1) + print ($values | get column1 | get 0) + print ($values | get column2 | get 0) + print ($values | get column1 | get 1) + print ($values | get column2 | get 1) "# ); diff --git a/crates/nu-command/tests/commands/try_.rs b/crates/nu-command/tests/commands/try_.rs index 0af8df34d..064c897af 100644 --- a/crates/nu-command/tests/commands/try_.rs +++ b/crates/nu-command/tests/commands/try_.rs @@ -54,7 +54,7 @@ fn external_failed_should_be_caught() { fn loop_try_break_should_be_successful() { let output = nu!( cwd: ".", - "loop { try { echo 'successful'; break } catch { echo 'failed'; continue } }" + "loop { try { print 'successful'; break } catch { print 'failed'; continue } }" ); assert_eq!(output.out, "successful"); @@ -66,7 +66,7 @@ fn loop_catch_break_should_show_failed() { cwd: ".", "loop { try { invalid 1; - continue; } catch { echo 'failed'; break } + continue; } catch { print 'failed'; break } } " ); diff --git a/crates/nu-command/tests/commands/while_.rs b/crates/nu-command/tests/commands/while_.rs index fc7a3643a..4b87a4c85 100644 --- a/crates/nu-command/tests/commands/while_.rs +++ b/crates/nu-command/tests/commands/while_.rs @@ -26,7 +26,7 @@ fn while_auto_print_in_each_iteration() { fn while_break_on_external_failed() { let actual = nu!( cwd: ".", - "mut total = 0; while $total < 2 { $total = $total + 1; echo 1; nu --testbin fail }" + "mut total = 0; while $total < 2 { $total = $total + 1; print 1; nu --testbin fail }" ); // Note: nu! macro auto replace "\n" and "\r\n" with "" // so our output will be `1` diff --git a/crates/nu-command/tests/commands/with_env.rs b/crates/nu-command/tests/commands/with_env.rs index 1947627ca..eb899a027 100644 --- a/crates/nu-command/tests/commands/with_env.rs +++ b/crates/nu-command/tests/commands/with_env.rs @@ -71,11 +71,11 @@ fn with_env_hides_variables_in_parent_scope() { cwd: "tests/fixtures/formats", r#" let-env FOO = "1" - echo $env.FOO + print $env.FOO with-env [FOO null] { echo $env.FOO } - echo $env.FOO + print $env.FOO "# ); @@ -88,9 +88,9 @@ fn with_env_shorthand_can_not_hide_variables() { cwd: "tests/fixtures/formats", r#" let-env FOO = "1" - echo $env.FOO - FOO=null echo $env.FOO - echo $env.FOO + print $env.FOO + FOO=null print $env.FOO + print $env.FOO "# ); diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs index ac61081aa..57a705148 100644 --- a/crates/nu-engine/src/eval.rs +++ b/crates/nu-engine/src/eval.rs @@ -6,10 +6,9 @@ use nu_protocol::{ Operator, PathMember, PipelineElement, Redirection, }, engine::{EngineState, ProfilingConfig, Stack}, - Config, DataSource, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData, - PipelineMetadata, Range, ShellError, Span, Spanned, Unit, Value, VarId, ENV_VARIABLE_ID, + DataSource, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData, PipelineMetadata, + Range, ShellError, Span, Spanned, Unit, Value, VarId, ENV_VARIABLE_ID, }; -use nu_utils::stdout_write_all_and_flush; use std::collections::HashMap; use std::time::Instant; @@ -1112,24 +1111,7 @@ pub fn eval_block( } => { let exit_code = exit_code.take(); - // Drain the input to the screen via tabular output - let config = engine_state.get_config(); - - match engine_state.find_decl("table".as_bytes(), &[]) { - Some(decl_id) => { - let table = engine_state.get_decl(decl_id).run( - engine_state, - stack, - &Call::new(Span::new(0, 0)), - input, - )?; - - print_or_return(table, config)?; - } - None => { - print_or_return(input, config)?; - } - }; + input.drain()?; if let Some(exit_code) = exit_code { let mut v: Vec<_> = exit_code.collect(); @@ -1139,40 +1121,7 @@ pub fn eval_block( } } } - _ => { - // Drain the input to the screen via tabular output - let config = engine_state.get_config(); - - match engine_state.find_decl("table".as_bytes(), &[]) { - Some(decl_id) => { - let table = engine_state.get_decl(decl_id); - - if let Some(block_id) = table.get_block_id() { - let block = engine_state.get_block(block_id); - eval_block( - engine_state, - stack, - block, - input, - redirect_stdout, - redirect_stderr, - )?; - } else { - let table = table.run( - engine_state, - stack, - &Call::new(Span::new(0, 0)), - input, - )?; - - print_or_return(table, config)?; - } - } - None => { - print_or_return(input, config)?; - } - }; - } + _ => input.drain()?, } input = PipelineData::empty() @@ -1187,21 +1136,6 @@ pub fn eval_block( } } -fn print_or_return(pipeline_data: PipelineData, config: &Config) -> Result<(), ShellError> { - for item in pipeline_data { - if let Value::Error { error } = item { - return Err(*error); - } - - let mut out = item.into_string("\n", config); - out.push('\n'); - - stdout_write_all_and_flush(out)?; - } - - Ok(()) -} - pub fn eval_subexpression( engine_state: &EngineState, stack: &mut Stack, diff --git a/crates/nu-protocol/src/pipeline_data.rs b/crates/nu-protocol/src/pipeline_data.rs index 2ca731d7d..804eff967 100644 --- a/crates/nu-protocol/src/pipeline_data.rs +++ b/crates/nu-protocol/src/pipeline_data.rs @@ -200,6 +200,26 @@ impl PipelineData { } } + pub fn drain(self) -> Result<(), ShellError> { + match self { + PipelineData::Value(Value::Error { error }, _) => Err(*error), + PipelineData::Value(_, _) => Ok(()), + PipelineData::ListStream(stream, _) => stream.drain(), + PipelineData::ExternalStream { stdout, stderr, .. } => { + if let Some(stdout) = stdout { + stdout.drain()?; + } + + if let Some(stderr) = stderr { + stderr.drain()?; + } + + Ok(()) + } + PipelineData::Empty => Ok(()), + } + } + /// Try convert from self into iterator /// /// It returns Err if the `self` cannot be converted to an iterator. diff --git a/crates/nu-protocol/src/value/stream.rs b/crates/nu-protocol/src/value/stream.rs index f00e90b9c..4a39cef66 100644 --- a/crates/nu-protocol/src/value/stream.rs +++ b/crates/nu-protocol/src/value/stream.rs @@ -75,6 +75,20 @@ impl RawStream { known_size: self.known_size, } } + + pub fn drain(self) -> Result<(), ShellError> { + for next in self { + match next { + Ok(val) => { + if let Value::Error { error } = val { + return Err(*error); + } + } + Err(err) => return Err(err), + } + } + Ok(()) + } } impl Debug for RawStream { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { @@ -201,6 +215,15 @@ impl ListStream { .join(separator) } + pub fn drain(self) -> Result<(), ShellError> { + for next in self { + if let Value::Error { error } = next { + return Err(*error); + } + } + Ok(()) + } + pub fn from_stream( input: impl Iterator + Send + 'static, ctrlc: Option>, diff --git a/tests/fixtures/formats/script_multiline.nu b/tests/fixtures/formats/script_multiline.nu index 389a3148a..96d8e2a8a 100644 --- a/tests/fixtures/formats/script_multiline.nu +++ b/tests/fixtures/formats/script_multiline.nu @@ -1,2 +1,2 @@ -echo [1 4] | length -echo [2 3 5] | length +print ([1 4] | length) +print (echo [2 3 5] | length) diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs index 8ee00d662..bfb270168 100644 --- a/tests/shell/pipeline/commands/internal.rs +++ b/tests/shell/pipeline/commands/internal.rs @@ -48,7 +48,7 @@ fn treats_dot_dot_as_path_not_range() { r#" mkdir temp; cd temp; - echo (open ../nu_times.csv).name.0 | table; + print (open ../nu_times.csv).name.0 | table; cd ..; rmdir temp "# @@ -385,9 +385,9 @@ fn let_env_hides_variable() { cwd: ".", r#" let-env TESTENVVAR = "hello world" - echo $env.TESTENVVAR + print $env.TESTENVVAR hide-env TESTENVVAR - echo $env.TESTENVVAR + print $env.TESTENVVAR "# ); @@ -401,12 +401,12 @@ fn let_env_hides_variable_in_parent_scope() { cwd: ".", r#" let-env TESTENVVAR = "hello world" - echo $env.TESTENVVAR + print $env.TESTENVVAR do { hide-env TESTENVVAR - echo $env.TESTENVVAR + print $env.TESTENVVAR } - echo $env.TESTENVVAR + print $env.TESTENVVAR "# ); @@ -446,14 +446,14 @@ fn unlet_variable_in_parent_scope() { cwd: ".", r#" let-env DEBUG = "1" - echo $env.DEBUG + print $env.DEBUG do { let-env DEBUG = "2" - echo $env.DEBUG + print $env.DEBUG hide-env DEBUG - echo $env.DEBUG + print $env.DEBUG } - echo $env.DEBUG + print $env.DEBUG "# ); @@ -477,7 +477,7 @@ fn proper_shadow_let_env_aliases() { let actual = nu!( cwd: ".", r#" - let-env DEBUG = "true"; echo $env.DEBUG | table; do { let-env DEBUG = "false"; echo $env.DEBUG } | table; echo $env.DEBUG + let-env DEBUG = "true"; print $env.DEBUG | table; do { let-env DEBUG = "false"; print $env.DEBUG } | table; print $env.DEBUG "# ); assert_eq!(actual.out, "truefalsetrue"); @@ -526,7 +526,7 @@ fn proper_shadow_load_env_aliases() { let actual = nu!( cwd: ".", r#" - let-env DEBUG = "true"; echo $env.DEBUG | table; do { echo {DEBUG: "false"} | load-env; echo $env.DEBUG } | table; echo $env.DEBUG + let-env DEBUG = "true"; print $env.DEBUG | table; do { echo {DEBUG: "false"} | load-env; print $env.DEBUG } | table; print $env.DEBUG "# ); assert_eq!(actual.out, "truefalsetrue"); @@ -576,7 +576,7 @@ fn proper_shadow_let_aliases() { let actual = nu!( cwd: ".", r#" - let DEBUG = false; echo $DEBUG | table; do { let DEBUG = true; echo $DEBUG } | table; echo $DEBUG + let DEBUG = false; print $DEBUG | table; do { let DEBUG = true; print $DEBUG } | table; print $DEBUG "# ); assert_eq!(actual.out, "falsetruefalse");