220b105efb
# Description
While perusing Value.rs, I noticed the `Value::int()`, `Value::float()`,
`Value::boolean()` and `Value::string()` constructors, which seem
designed to make it easier to construct various Values, but which aren't
used often at all in the codebase. So, using a few find-replaces
regexes, I increased their usage. This reduces overall LOC because
structures like this:
```
Value::Int {
val: a,
span: head
}
```
are changed into
```
Value::int(a, head)
```
and are respected as such by the project's formatter.
There are little readability concerns because the second argument to all
of these is `span`, and it's almost always extremely obvious which is
the span at every callsite.
# User-Facing Changes
None.
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
132 lines
3.9 KiB
Rust
132 lines
3.9 KiB
Rust
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct FromToml;
|
|
|
|
impl Command for FromToml {
|
|
fn name(&self) -> &str {
|
|
"from toml"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("from toml")
|
|
.input_output_types(vec![(Type::String, Type::Record(vec![]))])
|
|
.category(Category::Formats)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Parse text as .toml and create record."
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
example: "'a = 1' | from toml",
|
|
description: "Converts toml formatted string to record",
|
|
result: Some(Value::Record {
|
|
cols: vec!["a".to_string()],
|
|
vals: vec![Value::int(1, Span::test_data())],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
example: "'a = 1
|
|
b = [1, 2]' | from toml",
|
|
description: "Converts toml formatted string to record",
|
|
result: Some(Value::Record {
|
|
cols: vec!["a".to_string(), "b".to_string()],
|
|
vals: vec![
|
|
Value::int(1, Span::test_data()),
|
|
Value::List {
|
|
vals: vec![
|
|
Value::int(1, Span::test_data()),
|
|
Value::int(2, Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
},
|
|
],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
__engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, ShellError> {
|
|
let span = call.head;
|
|
let (mut string_input, metadata) = input.collect_string_strict(span)?;
|
|
string_input.push('\n');
|
|
Ok(convert_string_to_value(string_input, span)?.into_pipeline_data_with_metadata(metadata))
|
|
}
|
|
}
|
|
|
|
fn convert_toml_to_value(value: &toml::Value, span: Span) -> Value {
|
|
match value {
|
|
toml::Value::Array(array) => {
|
|
let v: Vec<Value> = array
|
|
.iter()
|
|
.map(|x| convert_toml_to_value(x, span))
|
|
.collect();
|
|
|
|
Value::List { vals: v, span }
|
|
}
|
|
toml::Value::Boolean(b) => Value::Bool { val: *b, span },
|
|
toml::Value::Float(f) => Value::Float { val: *f, span },
|
|
toml::Value::Integer(i) => Value::Int { val: *i, span },
|
|
toml::Value::Table(k) => {
|
|
let mut cols = vec![];
|
|
let mut vals = vec![];
|
|
|
|
for item in k {
|
|
cols.push(item.0.clone());
|
|
vals.push(convert_toml_to_value(item.1, span));
|
|
}
|
|
|
|
Value::Record { cols, vals, span }
|
|
}
|
|
toml::Value::String(s) => Value::String {
|
|
val: s.clone(),
|
|
span,
|
|
},
|
|
toml::Value::Datetime(d) => Value::String {
|
|
val: d.to_string(),
|
|
span,
|
|
},
|
|
}
|
|
}
|
|
|
|
pub fn convert_string_to_value(string_input: String, span: Span) -> Result<Value, ShellError> {
|
|
let result: Result<toml::Value, toml::de::Error> = toml::from_str(&string_input);
|
|
match result {
|
|
Ok(value) => Ok(convert_toml_to_value(&value, span)),
|
|
|
|
Err(_x) => Err(ShellError::CantConvert(
|
|
"structured toml data".into(),
|
|
"string".into(),
|
|
span,
|
|
None,
|
|
)),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(FromToml {})
|
|
}
|
|
}
|