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

Merge pull request #251 from nushell/better_split_column

Browse Source 
Use different helper functions for split column
This commit is contained in:
JT 2021-10-26 12:47:19 +13:00 committed by GitHub
commit a2c2a07638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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 {
vec![Value::Record {
cols,
vals,
span: head,
}],
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 }],
}
}
}