forked from extern/nushell
### Description Fixes issue #15135 Result  Also this works with other commands: min, max, sum, product, avg... ### User-Facing Changes Error is returned, instead of console completely blocked and having to be killed I chose "Incorrect value", because commands accept inputs of range type, just cannot work with unbounded ranges. ### Tests + Formatting - ran cargo fmt, clippy - added tests
This commit is contained in:
@ -1,6 +1,8 @@
|
||||
use core::slice;
|
||||
use core::{ops::Bound, slice};
|
||||
use indexmap::IndexMap;
|
||||
use nu_protocol::{engine::Call, IntoPipelineData, PipelineData, ShellError, Signals, Span, Value};
|
||||
use nu_protocol::{
|
||||
engine::Call, IntoPipelineData, PipelineData, Range, ShellError, Signals, Span, Value,
|
||||
};
|
||||
|
||||
pub fn run_with_function(
|
||||
call: &Call,
|
||||
@ -91,6 +93,10 @@ pub fn calculate(
|
||||
Ok(Value::record(record, span))
|
||||
}
|
||||
PipelineData::Value(Value::Range { val, .. }, ..) => {
|
||||
match *val {
|
||||
Range::IntRange(range) => ensure_bounded(range.end(), span, name)?,
|
||||
Range::FloatRange(range) => ensure_bounded(range.end(), span, name)?,
|
||||
}
|
||||
let new_vals: Result<Vec<Value>, ShellError> = val
|
||||
.into_range_iter(span, Signals::empty())
|
||||
.map(|val| mf(&[val], span, name))
|
||||
@ -110,3 +116,18 @@ pub fn calculate(
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ensure_bounded<T>(
|
||||
bound: Bound<T>,
|
||||
val_span: Span,
|
||||
call_span: Span,
|
||||
) -> Result<(), ShellError> {
|
||||
match bound {
|
||||
Bound::<T>::Unbounded => Err(ShellError::IncorrectValue {
|
||||
msg: "Range must be bounded".to_string(),
|
||||
val_span,
|
||||
call_span,
|
||||
}),
|
||||
_ => Ok(()),
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user