From 1a2a34fdbaa41884be4bf0c5131c2047e31ef517 Mon Sep 17 00:00:00 2001 From: Will Li Date: Wed, 8 Jan 2025 16:19:47 -0800 Subject: [PATCH] [Buck2] Starlark UnpackValue to return starlark::Error Summary: Change Unpack functions to return `starlark::Error` instead of `anyhow::Error`. Helps with removing a bunch of `from_any` in the code and reduces the amount of conversion from starlark->anyhow Test Plan: CI Reviewed By: JakobDegen Differential Revision: D67806044 fbshipit-source-id: 6a6d5c490cbb2cfdc5eb2886b6c498e5d891dd45 --- antlir/bzl/shape2/bzl2ir.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/antlir/bzl/shape2/bzl2ir.rs b/antlir/bzl/shape2/bzl2ir.rs index 5e099ffa667..4fc5b5384f6 100644 --- a/antlir/bzl/shape2/bzl2ir.rs +++ b/antlir/bzl/shape2/bzl2ir.rs @@ -291,7 +291,11 @@ fn shape(builder: &mut GlobalsBuilder) { .iterate(eval.heap()) .map_err(starlark::Error::into_anyhow) .context("while collecting enum variants")? - .map(|v| String::unpack_param(v).map(|s| s.into())) + .map(|v| { + String::unpack_param(v) + .map(|s| s.into()) + .map_err(starlark::Error::into_anyhow) + }) .collect::>()?; let enm = ir::Enum { options,