Move to* and from* to engine-p (#3320)

* WIP

* Finish last batch
This commit is contained in:
JT
2021-04-15 19:43:33 +12:00
committed by GitHub
parent fd7875e572
commit f73732bf1e
49 changed files with 299 additions and 445 deletions

View File

@@ -42,11 +42,11 @@ impl WholeStreamCommand for SubCommand {
pub fn eval(args: CommandArgs) -> Result<OutputStream, ShellError> {
let args = args.evaluate_once()?;
let expression: Option<Result<Tagged<String>, ShellError>> = args.opt(0);
let expression: Option<Tagged<String>> = args.opt(0)?;
let name = args.call_info.name_tag.clone();
let input = args.input;
if let Some(Ok(string)) = expression {
if let Some(string) = expression {
match parse(&string, &string.tag) {
Ok(value) => Ok(OutputStream::one(value)),
Err(err) => Err(ShellError::labeled_error(
@@ -58,10 +58,10 @@ pub fn eval(args: CommandArgs) -> Result<OutputStream, ShellError> {
} else {
let mapped: Result<Vec<_>, _> = input
.map(move |x| {
if let Some(Ok(Tagged {
if let Some(Tagged {
tag,
item: expression,
})) = &expression
}) = &expression
{
UntaggedValue::string(expression).into_value(tag)
} else {

View File

@@ -54,10 +54,10 @@ impl WholeStreamCommand for SubCommand {
fn operate(args: CommandArgs) -> Result<OutputStream, ShellError> {
let args = args.evaluate_once()?;
let precision: Option<Result<Tagged<i16>, ShellError>> = args.get_flag("precision");
let precision: Option<Tagged<i16>> = args.get_flag("precision")?;
let input = args.input;
let precision = if let Some(precision) = precision {
precision?.item
precision.item
} else {
0
};