From e22a1a70d68c4a61d6e9bf57aea39b7b1052dd45 Mon Sep 17 00:00:00 2001 From: Robin Freyler Date: Tue, 14 Feb 2023 09:06:51 +0100 Subject: [PATCH 1/2] display exported funcs for invoke when not found --- crates/cli/src/main.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 2489ae7d86..1ac1d65dd2 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -2,7 +2,7 @@ use crate::{ args::Args, display::{DisplayExportedFuncs, DisplayFuncType, DisplaySequence, DisplayValue}, }; -use anyhow::{bail, Error, Result}; +use anyhow::{bail, Error, Result, anyhow}; use clap::Parser; use context::Context; use std::{path::Path, process}; @@ -87,7 +87,13 @@ fn typecheck_args(func_name: &str, func_ty: &FuncType, args: &[Value]) -> Result fn get_invoked_func(args: &Args, ctx: &Context) -> Result<(String, Func), Error> { match args.invoked() { Some(func_name) => { - let func = ctx.get_func(func_name)?; + let func = ctx.get_func(func_name) + .map_err(|error| { + anyhow!( + "{error}\n\n{}", + DisplayExportedFuncs::from(ctx) + ) + })?; let func_name = func_name.into(); Ok((func_name, func)) } From c5d00389d4e1483694edf6e77a800fb09b5bf77e Mon Sep 17 00:00:00 2001 From: Robin Freyler Date: Tue, 14 Feb 2023 09:07:28 +0100 Subject: [PATCH 2/2] apply rustfmt --- crates/cli/src/main.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 1ac1d65dd2..abc979df40 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -2,7 +2,7 @@ use crate::{ args::Args, display::{DisplayExportedFuncs, DisplayFuncType, DisplaySequence, DisplayValue}, }; -use anyhow::{bail, Error, Result, anyhow}; +use anyhow::{anyhow, bail, Error, Result}; use clap::Parser; use context::Context; use std::{path::Path, process}; @@ -87,13 +87,9 @@ fn typecheck_args(func_name: &str, func_ty: &FuncType, args: &[Value]) -> Result fn get_invoked_func(args: &Args, ctx: &Context) -> Result<(String, Func), Error> { match args.invoked() { Some(func_name) => { - let func = ctx.get_func(func_name) - .map_err(|error| { - anyhow!( - "{error}\n\n{}", - DisplayExportedFuncs::from(ctx) - ) - })?; + let func = ctx + .get_func(func_name) + .map_err(|error| anyhow!("{error}\n\n{}", DisplayExportedFuncs::from(ctx)))?; let func_name = func_name.into(); Ok((func_name, func)) }