mirror of
https://github.com/nushell/nushell.git
synced 2025-06-30 22:50:14 +02:00
Automatically trim ends of stdin/stdout strings (#874)
This commit is contained in:
@ -124,6 +124,7 @@ impl Command for Open {
|
||||
RawStream::new(
|
||||
Box::new(BufferedReader { input: buf_reader }),
|
||||
ctrlc,
|
||||
false,
|
||||
call_span,
|
||||
),
|
||||
call_span,
|
||||
|
@ -362,6 +362,7 @@ fn response_to_buffer(
|
||||
input: buffered_input,
|
||||
}),
|
||||
engine_state.ctrlc.clone(),
|
||||
false,
|
||||
span,
|
||||
),
|
||||
span,
|
||||
|
@ -243,7 +243,7 @@ impl ExternalCommand {
|
||||
let receiver = ChannelReceiver::new(rx);
|
||||
|
||||
Ok(PipelineData::RawStream(
|
||||
RawStream::new(Box::new(receiver), output_ctrlc, head),
|
||||
RawStream::new(Box::new(receiver), output_ctrlc, true, head),
|
||||
head,
|
||||
None,
|
||||
))
|
||||
|
@ -72,6 +72,7 @@ impl Command for Table {
|
||||
.into_iter(),
|
||||
),
|
||||
ctrlc,
|
||||
false,
|
||||
head,
|
||||
),
|
||||
head,
|
||||
@ -188,6 +189,7 @@ impl Command for Table {
|
||||
stream,
|
||||
}),
|
||||
ctrlc,
|
||||
false,
|
||||
head,
|
||||
),
|
||||
head,
|
||||
|
@ -9,5 +9,7 @@ pub use call_ext::CallExt;
|
||||
pub use column::get_columns;
|
||||
pub use documentation::{generate_docs, get_brief_help, get_documentation, get_full_help};
|
||||
pub use env::*;
|
||||
pub use eval::{eval_block, eval_expression, eval_expression_with_input, eval_operator};
|
||||
pub use eval::{
|
||||
eval_block, eval_expression, eval_expression_with_input, eval_operator, eval_subexpression,
|
||||
};
|
||||
pub use glob_from::glob_from;
|
||||
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user