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

Clean up lines command (#2207)

Browse Source
This commit is contained in:
Joseph T. Lyons 2020-07-18 13:17:56 -04:00 committed by GitHub
parent 0ae7c5d836
commit 9e5170b3dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
crates/nu-cli/src/commands/lines.rs
View File

@ -68,32 +68,8 @@ async fn lines(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputSt
Value { Value {
value: UntaggedValue::Primitive(Primitive::String(st)), value: UntaggedValue::Primitive(Primitive::String(st)),
.. ..
} => {
let mut leftover_string = leftover_string.lock();
let st = (&*leftover_string).clone() + &st;
let mut lines: Vec<String> = st.lines().map(|x| x.to_string()).collect();
if !ends_with_line_ending(&st) {
if let Some(last) = lines.pop() {
leftover_string.clear();
leftover_string.push_str(&last);
} else {
leftover_string.clear();
}
} else {
leftover_string.clear();
}
let success_lines: Vec<_> = lines
.iter()
.map(|x| ReturnSuccess::value(UntaggedValue::line(x).into_untagged_value()))
.collect();
futures::stream::iter(success_lines)
} }
Value { | Value {
value: UntaggedValue::Primitive(Primitive::Line(st)), value: UntaggedValue::Primitive(Primitive::Line(st)),
.. ..
} => { } => {
@ -103,15 +79,12 @@ async fn lines(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputSt
let mut lines: Vec<String> = st.lines().map(|x| x.to_string()).collect(); let mut lines: Vec<String> = st.lines().map(|x| x.to_string()).collect();
leftover_string.clear();
if !ends_with_line_ending(&st) { if !ends_with_line_ending(&st) {
if let Some(last) = lines.pop() { if let Some(last) = lines.pop() {
leftover_string.clear();
leftover_string.push_str(&last); leftover_string.push_str(&last);
} else {
leftover_string.clear();
} }
} else {
leftover_string.clear();
} }
let success_lines: Vec<_> = lines let success_lines: Vec<_> = lines