Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-11-11 07:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use different helper functions for split column

Browse source
This commit is contained in:
JT 2021-10-26 12:35:51 +13:00
parent 798552b1b3
commit 766726d0fa
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crates/nu-command/src/strings/split/column.rs
View file

@ -54,7 +54,7 @@ fn split_column(
let rest: Vec<Spanned<String>> = call.rest(engine_state, stack, 1)?;
let collapse_empty = call.has_flag("collapse-empty");
input.map(move |x| split_column_helper(&x, &separator, &rest, collapse_empty, name_span))
input.flat_map(move |x| split_column_helper(&x, &separator, &rest, collapse_empty, name_span))
}
fn split_column_helper(
@ -63,7 +63,7 @@ fn split_column_helper(
rest: &[Spanned<String>],
collapse_empty: bool,
head: Span,
) -> Value {
) -> Vec<Value> {
if let Ok(s) = v.as_string() {
let splitter = separator.item.replace("\\n", "\n");
@ -95,24 +95,21 @@ fn split_column_helper(
vals.push(Value::string(k, head));
}
}
Value::List {
vals: vec![Value::Record {
cols,
vals,
span: head,
}],
vec![Value::Record {
cols,
vals,
span: head,
}
}]
} else {
match v.span() {
Ok(span) => Value::Error {
Ok(span) => vec![Value::Error {
error: ShellError::PipelineMismatch {
expected: Type::String,
expected_span: head,
origin: span,
},
},
Err(error) => Value::Error { error },
}],
Err(error) => vec![Value::Error { error }],
}
}
}