fmt: cargo fmt --all

This commit is contained in:
David Mason 2019-11-08 15:27:29 +00:00
parent 15986c598a
commit 4a6122905b

View File

@ -18,7 +18,11 @@ impl WholeStreamCommand for FromCSV {
fn signature(&self) -> Signature { fn signature(&self) -> Signature {
Signature::build("from-csv") Signature::build("from-csv")
.named("separator", SyntaxShape::String, "a character to separate columns, defaults to ','") .named(
"separator",
SyntaxShape::String,
"a character to separate columns, defaults to ','",
)
.switch("headerless", "don't treat the first row as column names") .switch("headerless", "don't treat the first row as column names")
} }
@ -94,20 +98,22 @@ fn from_csv(
) -> Result<OutputStream, ShellError> { ) -> Result<OutputStream, ShellError> {
let name_tag = name; let name_tag = name;
let sep = match separator { let sep = match separator {
Some(Tagged { item: Value::Primitive(Primitive::String(s)), tag, .. }) => { Some(Tagged {
item: Value::Primitive(Primitive::String(s)),
tag,
..
}) => {
let vec_s: Vec<char> = s.chars().collect(); let vec_s: Vec<char> = s.chars().collect();
if vec_s.len() != 1 { if vec_s.len() != 1 {
return Err(ShellError::labeled_error( return Err(ShellError::labeled_error(
"Expected a single separator char from --separator", "Expected a single separator char from --separator",
"requires a single character string input", "requires a single character string input",
tag, tag,
)) ));
}; };
vec_s[0] vec_s[0]
} }
_ => { _ => ',',
','
}
}; };
let stream = async_stream! { let stream = async_stream! {