Make `salsa_utils::SalsaResult` (now `arc_anyhow::Result`) the common result type.
I've renamed the module to `arc_anyhow`, since it is not actually salsa-specific: any attempt to cache errors would run into the same problems. (That is, we'ds till need to define this, even if we weren't using Salsa, purely because we wish to cache the return values!)
---
Making `arc_anyhow::Result` the common result type gets rid of cruft when writing code, where we have a separate impl / wrapper for Salsa.separate query function / body stuff.
It also gets rid of error nesting -- for the most part, `arc_anyhow::Result` won't convert into `anyhow::Result` except when adding `context`. That is actually kinda often, but whatever. :)
(The reason we want to avoid these conversions is -- well, if anyhow is Box, and arc_anyhow is Arc, how do you convert an `Arc<dyn T>` into a `Box<dyn T>`? By having a `Box<Arc<dyn T>>`. Oof!)
I tried to do less than this CL, but most of my attempts to be less invasive and get similar problems at the interop boundary. The easiest way to avoid anyhow/salsa interop problems is to stop directly using anyhow.
We may want to _truly_ stop using anyhow in order to avoid expensive round-trip conversions. At the moment it's not really buying us a lot.
PiperOrigin-RevId: 460483713
diff --git a/rs_bindings_from_cc/ir.rs b/rs_bindings_from_cc/ir.rs
index a2e83d5..c8acb08 100644
--- a/rs_bindings_from_cc/ir.rs
+++ b/rs_bindings_from_cc/ir.rs
@@ -6,7 +6,7 @@
//! `rs_bindings_from_cc/ir.h` for more
//! information.
-use anyhow::{anyhow, bail, Context, Result};
+use arc_anyhow::{anyhow, bail, Context, Result};
use proc_macro2::{Literal, TokenStream};
use quote::{ToTokens, TokenStreamExt};
use serde::Deserialize;
@@ -560,9 +560,9 @@
}
impl<'a> TryFrom<&'a Item> for &'a Rc<Func> {
- type Error = anyhow::Error;
+ type Error = arc_anyhow::Error;
fn try_from(value: &'a Item) -> Result<Self, Self::Error> {
- if let Item::Func(f) = value { Ok(f) } else { anyhow::bail!("Not a Func: {:#?}", value) }
+ if let Item::Func(f) = value { Ok(f) } else { bail!("Not a Func: {:#?}", value) }
}
}
@@ -573,12 +573,12 @@
}
impl<'a> TryFrom<&'a Item> for &'a Rc<Record> {
- type Error = anyhow::Error;
+ type Error = arc_anyhow::Error;
fn try_from(value: &'a Item) -> Result<Self, Self::Error> {
if let Item::Record(r) = value {
Ok(r)
} else {
- anyhow::bail!("Not a Record: {:#?}", value)
+ bail!("Not a Record: {:#?}", value)
}
}
}
@@ -590,12 +590,12 @@
}
impl<'a> TryFrom<&'a Item> for &'a Rc<UnsupportedItem> {
- type Error = anyhow::Error;
+ type Error = arc_anyhow::Error;
fn try_from(value: &'a Item) -> Result<Self, Self::Error> {
if let Item::UnsupportedItem(u) = value {
Ok(u)
} else {
- anyhow::bail!("Not an UnsupportedItem: {:#?}", value)
+ bail!("Not an UnsupportedItem: {:#?}", value)
}
}
}
@@ -607,12 +607,12 @@
}
impl<'a> TryFrom<&'a Item> for &'a Rc<Comment> {
- type Error = anyhow::Error;
+ type Error = arc_anyhow::Error;
fn try_from(value: &'a Item) -> Result<Self, Self::Error> {
if let Item::Comment(c) = value {
Ok(c)
} else {
- anyhow::bail!("Not a Comment: {:#?}", value)
+ bail!("Not a Comment: {:#?}", value)
}
}
}
