extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 09:55:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Automatically trim ends of stdin/stdout strings (#874)

Browse Source
This commit is contained in:
JT
2022-01-28 16:59:00 -05:00
committed by GitHub
parent c37f844644
commit 4c029d2545
9 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/nu-protocol/src/pipeline_data.rs
View File

@ -150,6 +150,8 @@ impl PipelineData {
PipelineData::RawStream(s, ..) => {
let mut items = vec![];
let trim_end = s.trim_end;
for val in s {
match val {
Ok(val) => {
@ -170,6 +172,11 @@ impl PipelineData {
}
}
}
if trim_end {
output = output.trim_end().to_string();
}
Ok(output)
}
}

9
crates/nu-protocol/src/value/stream.rs
View File

@ -12,6 +12,7 @@ pub struct RawStream {
pub leftover: Vec<u8>,
pub ctrlc: Option<Arc<AtomicBool>>,
pub is_binary: bool,
pub trim_end: bool,
pub span: Span,
}
@ -19,6 +20,7 @@ impl RawStream {
pub fn new(
stream: Box<dyn Iterator<Item = Result<Vec<u8>, ShellError>> + Send + 'static>,
ctrlc: Option<Arc<AtomicBool>>,
trim_end: bool,
span: Span,
) -> Self {
Self {
@ -26,6 +28,7 @@ impl RawStream {
leftover: vec![],
ctrlc,
is_binary: false,
trim_end,
span,
}
}
@ -43,10 +46,16 @@ impl RawStream {
pub fn into_string(self) -> Result<String, ShellError> {
let mut output = String::new();
let trim_end = self.trim_end;
for item in self {
output.push_str(&item?.as_string()?);
}
if trim_end {
output = output.trim_end().to_string();
}
Ok(output)
}
}