'buck2_re_configuration': remove anyhow usage

Summary: ^ Reviewed By: iguridi Differential Revision: D65311904 fbshipit-source-id: f0595ebb03426d2ee1884747f80ae7e730397c0b
facebook · Nov 2, 2024 · a4df9cc · a4df9cc
1 parent 583ba2f
commit a4df9cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/app/buck2_re_configuration/BUCK b/app/buck2_re_configuration/BUCK
@@ -6,9 +6,9 @@ rust_library(
     name = "buck2_re_configuration",
     srcs = glob(["src/**/*.rs"]),
     deps = [
-        "fbsource//third-party/rust:anyhow",
         "//buck2/allocative/allocative:allocative",
         "//buck2/app/buck2_common:buck2_common",
         "//buck2/app/buck2_core:buck2_core",
+        "//buck2/app/buck2_error:buck2_error",
     ],
 )
diff --git a/app/buck2_re_configuration/Cargo.toml b/app/buck2_re_configuration/Cargo.toml
@@ -8,9 +8,9 @@ version = "0.1.0"
 
 [dependencies]
 allocative = { workspace = true }
-anyhow = { workspace = true }
 buck2_common = { workspace = true }
 buck2_core = { workspace = true }
+buck2_error = { workspace = true }
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ["cfg(fbcode_build)"] }
diff --git a/app/buck2_re_configuration/src/lib.rs b/app/buck2_re_configuration/src/lib.rs
@@ -21,7 +21,7 @@ static BUCK2_RE_CLIENT_CFG_SECTION: &str = "buck2_re_client";
 /// We put functions here that both things need to implement for code that isn't gated behind a
 /// fbcode_build or not(fbcode_build)
 pub trait RemoteExecutionStaticMetadataImpl: Sized {
-    fn from_legacy_config(legacy_config: &LegacyBuckConfig) -> anyhow::Result<Self>;
+    fn from_legacy_config(legacy_config: &LegacyBuckConfig) -> buck2_error::Result<Self>;
     fn cas_semaphore_size(&self) -> usize;
 }
 
@@ -79,7 +79,7 @@ mod fbcode {
     }
 
     impl RemoteExecutionStaticMetadataImpl for RemoteExecutionStaticMetadata {
-        fn from_legacy_config(legacy_config: &LegacyBuckConfig) -> anyhow::Result<Self> {
+        fn from_legacy_config(legacy_config: &LegacyBuckConfig) -> buck2_error::Result<Self> {
             Ok(Self {
                 cas_address: legacy_config.parse(BuckconfigKeyRef {
                     section: BUCK2_RE_CLIENT_CFG_SECTION,
@@ -249,7 +249,7 @@ mod not_fbcode {
     pub struct RemoteExecutionStaticMetadata(pub Buck2OssReConfiguration);
 
     impl RemoteExecutionStaticMetadataImpl for RemoteExecutionStaticMetadata {
-        fn from_legacy_config(legacy_config: &LegacyBuckConfig) -> anyhow::Result<Self> {
+        fn from_legacy_config(legacy_config: &LegacyBuckConfig) -> buck2_error::Result<Self> {
             Ok(Self(Buck2OssReConfiguration::from_legacy_config(
                 legacy_config,
             )?))
@@ -313,7 +313,7 @@ pub struct HttpHeader {
 }
 
 impl FromStr for HttpHeader {
-    type Err = anyhow::Error;
+    type Err = buck2_error::Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut iter = s.split(':');
@@ -322,7 +322,8 @@ impl FromStr for HttpHeader {
                 key: key.trim().to_owned(),
                 value: value.trim().to_owned(),
             }),
-            _ => Err(anyhow::anyhow!(
+            _ => Err(buck2_error::buck2_error!(
+                [],
                 "Invalid header (expect exactly one `:`): `{}`",
                 s
             )),
@@ -331,7 +332,7 @@ impl FromStr for HttpHeader {
 }
 
 impl Buck2OssReConfiguration {
-    pub fn from_legacy_config(legacy_config: &LegacyBuckConfig) -> anyhow::Result<Self> {
+    pub fn from_legacy_config(legacy_config: &LegacyBuckConfig) -> buck2_error::Result<Self> {
         // this is used for all three services by default, if given; if one of
         // them has an explicit address given as well though, use that instead
         let default_address: Option<String> = legacy_config.parse(BuckconfigKeyRef {