Change Value::Error to &(dyn Error + 'static) (#68)

tokio-rs · Oct 8, 2021 · acd1a7e · acd1a7e
1 parent 48c623f
commit acd1a7e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/tests/tests/value.rs b/tests/tests/value.rs
@@ -246,6 +246,13 @@ fn test_error() {
     let error: io::Error = io::ErrorKind::Other.into();
     let error: &dyn error::Error = &error;
     assert_value!(&'a dyn error::Error: Error, as_error, yes => error);
+
+    assert!(error
+        .as_value()
+        .as_error()
+        .unwrap()
+        .downcast_ref::<io::Error>()
+        .is_some()); // Check that Value::Error downcast-able
 }
 
 test_num! {

diff --git a/valuable/src/valuable.rs b/valuable/src/valuable.rs
@@ -321,7 +321,7 @@ impl Valuable for std::path::PathBuf {
 }
 
 #[cfg(feature = "std")]
-impl Valuable for dyn std::error::Error + '_ {
+impl Valuable for dyn std::error::Error + 'static {
     fn as_value(&self) -> Value<'_> {
         Value::Error(self)
     }

diff --git a/valuable/src/value.rs b/valuable/src/value.rs
@@ -325,7 +325,7 @@ value! {
     /// let v = Value::Error(&err);
     /// ```
     #[cfg(feature = "std")]
-    Error(&'a dyn std::error::Error),
+    Error(&'a (dyn std::error::Error +'static)),
 
     /// A Rust list value
     ///
@@ -574,7 +574,7 @@ macro_rules! convert {
             /// assert!(Value::Bool(true).as_error().is_none());
             /// ```
             #[cfg(feature = "std")]
-            pub fn as_error(&self) -> Option<&dyn std::error::Error> {
+            pub fn as_error(&self) -> Option<&(dyn std::error::Error + 'static)> {
                 match *self {
                     Value::Error(v) => Some(v),
                     _ => None,