7a7d43344e
# Description Currently, `Range` is a struct with a `from`, `to`, and `incr` field, which are all type `Value`. This PR changes `Range` to be an enum over `IntRange` and `FloatRange` for better type safety / stronger compile time guarantees. Fixes: #11778 Fixes: #11777 Fixes: #11776 Fixes: #11775 Fixes: #11774 Fixes: #11773 Fixes: #11769. # User-Facing Changes Hopefully none, besides bug fixes. Although, the `serde` representation might have changed.
97 lines
2.9 KiB
Rust
97 lines
2.9 KiB
Rust
use nu_protocol::{CustomValue, IntoSpanned, ShellError, Spanned, Value};
|
|
|
|
/// Do something with all [`CustomValue`]s recursively within a `Value`. This is not limited to
|
|
/// plugin custom values.
|
|
///
|
|
/// `LazyRecord`s will be collected to plain values for completeness.
|
|
pub fn with_custom_values_in<E>(
|
|
value: &mut Value,
|
|
mut f: impl FnMut(Spanned<&mut (dyn CustomValue + '_)>) -> Result<(), E>,
|
|
) -> Result<(), E>
|
|
where
|
|
E: From<ShellError>,
|
|
{
|
|
value.recurse_mut(&mut |value| {
|
|
let span = value.span();
|
|
match value {
|
|
Value::Custom { val, .. } => {
|
|
// Operate on a CustomValue.
|
|
f(val.as_mut().into_spanned(span))
|
|
}
|
|
// LazyRecord would be a problem for us, since it could return something else the
|
|
// next time, and we have to collect it anyway to serialize it. Collect it in place,
|
|
// and then use the result
|
|
Value::LazyRecord { val, .. } => {
|
|
*value = val.collect()?;
|
|
Ok(())
|
|
}
|
|
_ => Ok(()),
|
|
}
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn find_custom_values() {
|
|
use crate::protocol::test_util::test_plugin_custom_value;
|
|
use nu_protocol::{engine::Closure, record, LazyRecord, Span};
|
|
|
|
#[derive(Debug, Clone)]
|
|
struct Lazy;
|
|
impl<'a> LazyRecord<'a> for Lazy {
|
|
fn column_names(&'a self) -> Vec<&'a str> {
|
|
vec!["custom", "plain"]
|
|
}
|
|
|
|
fn get_column_value(&self, column: &str) -> Result<Value, ShellError> {
|
|
Ok(match column {
|
|
"custom" => Value::test_custom_value(Box::new(test_plugin_custom_value())),
|
|
"plain" => Value::test_int(42),
|
|
_ => unimplemented!(),
|
|
})
|
|
}
|
|
|
|
fn span(&self) -> Span {
|
|
Span::test_data()
|
|
}
|
|
|
|
fn clone_value(&self, span: Span) -> Value {
|
|
Value::lazy_record(Box::new(self.clone()), span)
|
|
}
|
|
}
|
|
|
|
let mut cv = Value::test_custom_value(Box::new(test_plugin_custom_value()));
|
|
|
|
let mut value = Value::test_record(record! {
|
|
"bare" => cv.clone(),
|
|
"list" => Value::test_list(vec![
|
|
cv.clone(),
|
|
Value::test_int(4),
|
|
]),
|
|
"closure" => Value::test_closure(
|
|
Closure {
|
|
block_id: 0,
|
|
captures: vec![(0, cv.clone()), (1, Value::test_string("foo"))]
|
|
}
|
|
),
|
|
"lazy" => Value::test_lazy_record(Box::new(Lazy)),
|
|
});
|
|
|
|
// Do with_custom_values_in, and count the number of custom values found
|
|
let mut found = 0;
|
|
with_custom_values_in::<ShellError>(&mut value, |_| {
|
|
found += 1;
|
|
Ok(())
|
|
})
|
|
.expect("error");
|
|
assert_eq!(4, found, "found in value");
|
|
|
|
// Try it on bare custom value too
|
|
found = 0;
|
|
with_custom_values_in::<ShellError>(&mut cv, |_| {
|
|
found += 1;
|
|
Ok(())
|
|
})
|
|
.expect("error");
|
|
assert_eq!(1, found, "bare custom value didn't work");
|
|
}
|