mirror of
https://github.com/nushell/nushell.git
synced 2025-08-09 14:15:53 +02:00
Port all?
command (#365)
* Implement `From<bool>` for `Value` * Add `All` command * Change `IntoPipelineData` and `IntoInterruptiblePipelineData` bounds * Refactor `PipelineIterator` impls * Add `PipelineData::into_interruptible_iter` * Use `into_interruptible_iter` instead of `all` helper * Merge imports * Refactor `PipelineData::{filter, map}` * Change comment pronoun * Treat `RowCondition` as a block * Remove unnecessary braces * Address cluppy warning
This commit is contained in:
@ -51,6 +51,16 @@ impl PipelineData {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn into_interruptible_iter(self, ctrlc: Option<Arc<AtomicBool>>) -> PipelineIterator {
|
||||
let mut iter = self.into_iter();
|
||||
|
||||
if let PipelineIterator(PipelineData::Stream(s)) = &mut iter {
|
||||
s.ctrlc = ctrlc;
|
||||
}
|
||||
|
||||
iter
|
||||
}
|
||||
|
||||
pub fn collect_string(self, separator: &str, config: &Config) -> String {
|
||||
match self {
|
||||
PipelineData::Value(v) => v.into_string(separator, config),
|
||||
@ -104,13 +114,10 @@ impl PipelineData {
|
||||
PipelineData::Value(Value::Range { val, .. }) => {
|
||||
Ok(val.into_range_iter()?.map(f).into_pipeline_data(ctrlc))
|
||||
}
|
||||
PipelineData::Value(v) => {
|
||||
let output = f(v);
|
||||
match output {
|
||||
Value::Error { error } => Err(error),
|
||||
v => Ok(v.into_pipeline_data()),
|
||||
}
|
||||
}
|
||||
PipelineData::Value(v) => match f(v) {
|
||||
Value::Error { error } => Err(error),
|
||||
v => Ok(v.into_pipeline_data()),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@ -153,10 +160,9 @@ impl PipelineData {
|
||||
Ok(vals.into_iter().filter(f).into_pipeline_data(ctrlc))
|
||||
}
|
||||
PipelineData::Stream(stream) => Ok(stream.filter(f).into_pipeline_data(ctrlc)),
|
||||
PipelineData::Value(Value::Range { val, .. }) => match val.into_range_iter() {
|
||||
Ok(iter) => Ok(iter.filter(f).into_pipeline_data(ctrlc)),
|
||||
Err(error) => Err(error),
|
||||
},
|
||||
PipelineData::Value(Value::Range { val, .. }) => {
|
||||
Ok(val.into_range_iter()?.filter(f).into_pipeline_data(ctrlc))
|
||||
}
|
||||
PipelineData::Value(v) => {
|
||||
if f(&v) {
|
||||
Ok(v.into_pipeline_data())
|
||||
@ -190,12 +196,12 @@ impl IntoIterator for PipelineData {
|
||||
}))
|
||||
}
|
||||
PipelineData::Value(Value::Range { val, .. }) => match val.into_range_iter() {
|
||||
Ok(val) => PipelineIterator(PipelineData::Stream(ValueStream {
|
||||
stream: Box::new(val),
|
||||
Ok(iter) => PipelineIterator(PipelineData::Stream(ValueStream {
|
||||
stream: Box::new(iter),
|
||||
ctrlc: None,
|
||||
})),
|
||||
Err(e) => PipelineIterator(PipelineData::Stream(ValueStream {
|
||||
stream: Box::new(vec![Value::Error { error: e }].into_iter()),
|
||||
Err(error) => PipelineIterator(PipelineData::Stream(ValueStream {
|
||||
stream: Box::new(std::iter::once(Value::Error { error })),
|
||||
ctrlc: None,
|
||||
})),
|
||||
},
|
||||
@ -210,10 +216,7 @@ impl Iterator for PipelineIterator {
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
match &mut self.0 {
|
||||
PipelineData::Value(Value::Nothing { .. }) => None,
|
||||
PipelineData::Value(v) => {
|
||||
let prev = std::mem::take(v);
|
||||
Some(prev)
|
||||
}
|
||||
PipelineData::Value(v) => Some(std::mem::take(v)),
|
||||
PipelineData::Stream(stream) => stream.next(),
|
||||
}
|
||||
}
|
||||
@ -223,9 +226,12 @@ pub trait IntoPipelineData {
|
||||
fn into_pipeline_data(self) -> PipelineData;
|
||||
}
|
||||
|
||||
impl IntoPipelineData for Value {
|
||||
impl<V> IntoPipelineData for V
|
||||
where
|
||||
V: Into<Value>,
|
||||
{
|
||||
fn into_pipeline_data(self) -> PipelineData {
|
||||
PipelineData::Value(self)
|
||||
PipelineData::Value(self.into())
|
||||
}
|
||||
}
|
||||
|
||||
@ -233,13 +239,15 @@ pub trait IntoInterruptiblePipelineData {
|
||||
fn into_pipeline_data(self, ctrlc: Option<Arc<AtomicBool>>) -> PipelineData;
|
||||
}
|
||||
|
||||
impl<T> IntoInterruptiblePipelineData for T
|
||||
impl<I> IntoInterruptiblePipelineData for I
|
||||
where
|
||||
T: Iterator<Item = Value> + Send + 'static,
|
||||
I: IntoIterator + Send + 'static,
|
||||
I::IntoIter: Send + 'static,
|
||||
<I::IntoIter as Iterator>::Item: Into<Value>,
|
||||
{
|
||||
fn into_pipeline_data(self, ctrlc: Option<Arc<AtomicBool>>) -> PipelineData {
|
||||
PipelineData::Stream(ValueStream {
|
||||
stream: Box::new(self),
|
||||
stream: Box::new(self.into_iter().map(Into::into)),
|
||||
ctrlc,
|
||||
})
|
||||
}
|
||||
|
@ -1,5 +1,14 @@
|
||||
use crate::{ShellError, Span, Value};
|
||||
|
||||
impl From<bool> for Value {
|
||||
fn from(val: bool) -> Self {
|
||||
Value::Bool {
|
||||
val,
|
||||
span: Span::unknown(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<u8> for Value {
|
||||
fn from(val: u8) -> Self {
|
||||
Value::Int {
|
||||
|
Reference in New Issue
Block a user