diff options
author | Vincent Ambo <mail@tazj.in> | 2023-01-13T11·18+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2023-01-20T15·39+0000 |
commit | f12f938166e5b0c773f3553fb7e7422a58e83c6d (patch) | |
tree | a120aa4f8fcd744e58048d627ab02b08d1a2f4d0 /tvix/eval/builtin-macros/src/lib.rs | |
parent | 972c867b365631f771f6933cd9a6384316d5aea5 (diff) |
refactor(tvix/eval): directly return builtin tuples from macro r/5707
All invocations of the builtin macro had to previously filter through the `builtin_tuple` function, but it's more sensible to directly return these from the macro. Change-Id: I45600ba84d56c9528d3e92570461c319eea595ce Reviewed-on: https://cl.tvl.fyi/c/depot/+/7825 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/eval/builtin-macros/src/lib.rs')
-rw-r--r-- | tvix/eval/builtin-macros/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/eval/builtin-macros/src/lib.rs b/tvix/eval/builtin-macros/src/lib.rs index ff1c52e03fd8..5a54d499124d 100644 --- a/tvix/eval/builtin-macros/src/lib.rs +++ b/tvix/eval/builtin-macros/src/lib.rs @@ -209,8 +209,8 @@ pub fn builtins(_args: TokenStream, item: TokenStream) -> TokenStream { } items.push(parse_quote! { - pub fn builtins() -> Vec<crate::Builtin> { - vec![#(#builtins),*] + pub fn builtins() -> Vec<(&'static str, Value)> { + vec![#(#builtins),*].into_iter().map(|b| (b.name(), Value::Builtin(b))).collect() } }); |