Bumped error_stack, exposed from crate to prevent needing to depend d…

…ownstream anymore

rust/Cargo.toml

@@ -25,7 +25,7 @@ all-features = true
 [dependencies]
 parking_lot = { version = "0.12", features = ["serde"] }
 tracing = "0.1"
-error-stack = "0.4"
+error-stack = { version = "0.5", features = ["anyhow", "serde"] }
 colored = '2'
 tracing-subscriber = { version = "0.3", features = ["fmt", "std", "time"] }
 serde = { version = "1", features = ["derive", "rc"] }

rust/bitbazaar/errors/macros.rs

@@ -8,21 +8,21 @@
 #[macro_export]
 macro_rules! anyerr {
     () => {{
-        use error_stack::Report;
+        use $crate::errors::error_stack::Report;
         use $crate::errors::AnyErr;
 
         Report::new(AnyErr)
     }};
 
     ($str:expr) => {{
-        use error_stack::Report;
+        use $crate::errors::error_stack::Report;
         use $crate::errors::AnyErr;
 
         Report::new(AnyErr).attach_printable($str)
     }};
 
     ($str:expr, $($arg:expr),*) => {{
-        use error_stack::Report;
+        use $crate::errors::error_stack::Report;
         use $crate::errors::AnyErr;
 
         Report::new(AnyErr).attach_printable(format!($str, $($arg),*))
@@ -39,19 +39,19 @@ macro_rules! anyerr {
 #[macro_export]
 macro_rules! err {
     ($err_variant:expr) => {{
-        use error_stack::Report;
+        use $crate::errors::error_stack::Report;
 
         Report::new($err_variant)
     }};
 
     ($err_variant:expr, $str:expr) => {{
-        use error_stack::Report;
+        use $crate::errors::error_stack::Report;
 
         Report::new($err_variant).attach_printable($str)
     }};
 
     ($err_variant:expr, $str:expr, $($arg:expr),*) => {{
-        use error_stack::Report;
+        use $crate::errors::error_stack::Report;
 
         Report::new($err_variant).attach_printable(format!($str, $($arg),*))
     }};

rust/bitbazaar/errors/mod.rs

@@ -1,6 +1,9 @@
 mod any;
 mod macros;
 
+/// Publicly exporting the error stack crate, to prevent every dependent depending on it too.
+pub use error_stack;
+
 pub use any::AnyErr;
 
 /// Shorthand for a [`Result`] with a [`error_stack::Report`] as the error variant