extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-12-22 15:13:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle external redirects better (#598)

Browse Source 
* Handle external redirects better

* fix warnings
This commit is contained in:
JT 2021-12-28 01:58:53 +11:00 committed by GitHub
parent f50f37c853
commit 1dbf351425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/nu-engine/src/eval.rs
View File

@ -250,7 +250,7 @@ pub fn eval_expression(
span, span,
args, args,
PipelineData::new(*span), PipelineData::new(*span),
true, false,
)? )?
.into_value(*span)) .into_value(*span))
} }
@ -480,7 +480,7 @@ pub fn eval_subexpression(
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
for stmt in block.stmts.iter() { for stmt in block.stmts.iter() {
if let Statement::Pipeline(pipeline) = stmt { if let Statement::Pipeline(pipeline) = stmt {
for (i, elem) in pipeline.expressions.iter().enumerate() { for elem in pipeline.expressions.iter() {
match elem { match elem {
Expression { Expression {
expr: Expr::Call(call), expr: Expr::Call(call),
@ -501,24 +501,6 @@ pub fn eval_subexpression(
input, input,
false, false,
)?; )?;
if i == pipeline.expressions.len() - 1 {
// We're at the end, so drain as a string for the value
// to be used later
// FIXME: the trimming of the end probably needs to live in a better place
let config = stack.get_config().unwrap_or_default();
let mut s = input.collect_string("", &config)?;
if s.ends_with('\n') {
s.pop();
}
input = Value::String {
val: s.to_string(),
span: *name_span,
}
.into_pipeline_data()
}
} }
elem => { elem => {