8da27a1a09
# Description
This PR creates a new `Record` type to reduce duplicate code and
possibly bugs as well. (This is an edited version of #9648.)
- `Record` implements `FromIterator` and `IntoIterator` and so can be
iterated over or collected into. For example, this helps with
conversions to and from (hash)maps. (Also, no more
`cols.iter().zip(vals)`!)
- `Record` has a `push(col, val)` function to help insure that the
number of columns is equal to the number of values. I caught a few
potential bugs thanks to this (e.g. in the `ls` command).
- Finally, this PR also adds a `record!` macro that helps simplify
record creation. It is used like so:
```rust
record! {
"key1" => some_value,
"key2" => Value::string("text", span),
"key3" => Value::int(optional_int.unwrap_or(0), span),
"key4" => Value::bool(config.setting, span),
}
```
Since macros hinder formatting, etc., the right hand side values should
be relatively short and sweet like the examples above.
Where possible, prefer `record!` or `.collect()` on an iterator instead
of multiple `Record::push`s, since the first two automatically set the
record capacity and do less work overall.
# User-Facing Changes
Besides the changes in `nu-protocol` the only other breaking changes are
to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
44 lines
1.1 KiB
Rust
44 lines
1.1 KiB
Rust
use super::NuLazyGroupBy;
|
|
use nu_protocol::{record, CustomValue, ShellError, Span, Value};
|
|
|
|
// CustomValue implementation for NuDataFrame
|
|
impl CustomValue for NuLazyGroupBy {
|
|
fn typetag_name(&self) -> &'static str {
|
|
"lazygroupby"
|
|
}
|
|
|
|
fn typetag_deserialize(&self) {
|
|
unimplemented!("typetag_deserialize")
|
|
}
|
|
|
|
fn clone_value(&self, span: nu_protocol::Span) -> Value {
|
|
let cloned = NuLazyGroupBy {
|
|
group_by: self.group_by.clone(),
|
|
schema: self.schema.clone(),
|
|
from_eager: self.from_eager,
|
|
};
|
|
|
|
Value::CustomValue {
|
|
val: Box::new(cloned),
|
|
span,
|
|
}
|
|
}
|
|
|
|
fn value_string(&self) -> String {
|
|
self.typetag_name().to_string()
|
|
}
|
|
|
|
fn to_base_value(&self, span: Span) -> Result<Value, ShellError> {
|
|
Ok(Value::record(
|
|
record! {
|
|
"LazyGroupBy" => Value::string("apply aggregation to complete execution plan", span)
|
|
},
|
|
span,
|
|
))
|
|
}
|
|
|
|
fn as_any(&self) -> &dyn std::any::Any {
|
|
self
|
|
}
|
|
}
|