tmep

Author: Ariel Ben-Yehuda

library/core/src/error/provide.rs

@@ -675,7 +675,7 @@ pub trait MultiResponse<'a> {
     /// consumes the reference, so the next call to `retrieve_ref`
     /// with the same type will not call `fulfil`.
     ///
-    /// This function returns `self`` to allow easy chained use.
+    /// This function returns `self` to allow easy chained use.
     ///
     /// # Examples
     ///
@@ -684,13 +684,13 @@ pub trait MultiResponse<'a> {
     ///
     /// ```
     /// #![feature(error_generic_member_access)]
-    /// use core::error::MultiRequestBuilder;
+    /// use core::error::{Error, MultiRequestBuilder, MultiResponse};
     ///
     /// fn get_str(e: &dyn Error) -> Option<&str> {
     ///     let mut result = None;
     ///     MultiRequestBuilder::new()
     ///         .with_ref::<str>()
-    ///         .request(&e)
+    ///         .request(e)
     ///         .retrieve_ref(|res| result = Some(res));
     ///     result
     /// }
@@ -714,13 +714,13 @@ pub trait MultiResponse<'a> {
     ///
     /// ```
     /// #![feature(error_generic_member_access)]
-    /// use core::error::MultiRequestBuilder;
+    /// use core::error::{Error, MultiRequestBuilder, MultiResponse};
     ///
     /// fn get_string(e: &dyn Error) -> Option<String> {
     ///     let mut result = None;
     ///     MultiRequestBuilder::new()
     ///         .with_value::<String>()
-    ///         .request(&e)
+    ///         .request(e)
     ///         .retrieve_value(|res| result = Some(res));
     ///     result
     /// }
@@ -913,14 +913,15 @@ where
 /// ```
 /// #![feature(error_generic_member_access)]
 /// use core::fmt;
-/// use core::error::{Error, ValueHaver, Request};
+/// use core::error::{Error, MultiResponse, Request};
 ///
 /// #[derive(Debug)]
 /// struct MyError {
 ///     str_field: &'static str,
 ///     val_field: MyExitCode,
 /// }
 ///
+/// #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 /// struct MyExitCode(u32);
 ///
 /// impl fmt::Display for MyError {
@@ -930,11 +931,10 @@ where
 /// }
 ///
 /// impl Error for MyError {
-///     #[no_mangle]
 ///     fn provide<'a>(&'a self, request: &mut Request<'a>) {
 ///         request
 ///             .provide_ref::<str>(self.str_field)
-///             .provide_value::<u32>(self.val_field);
+///             .provide_value::<MyExitCode>(self.val_field);
 ///     }
 /// }
 ///
@@ -951,13 +951,13 @@ where
 ///         // request by reference
 ///         .with_ref::<str>()
 ///         // and by value
-///         .with_value::<u32>()
+///         .with_value::<MyExitCode>()
 ///         // and some type that isn't in the error
 ///         .with_value::<String>()
 ///         .request(&e)
 ///         // The error has str by reference
 ///         .retrieve_ref::<str>(|val| str_val = Some(val))
-///         // The error has u32 by value
+///         // The error has MyExitCode by value
 ///         .retrieve_value::<MyExitCode>(|val| exit_code_val = Some(val))
 ///         // The error does not have a string field, consume will not be called
 ///         .retrieve_value::<String>(|val| string_val = Some(val));
@@ -986,13 +986,13 @@ impl<INNER: for<'a> IntoMultiRequest<'a>> MultiRequestBuilder<INNER> {
     ///
     /// ```
     /// #![feature(error_generic_member_access)]
-    /// use core::error::MultiRequestBuilder;
+    /// use core::error::{Error, MultiRequestBuilder, MultiResponse};
     ///
     /// fn get_string(e: &dyn Error) -> Option<String> {
     ///     let mut result = None;
     ///     MultiRequestBuilder::new()
     ///         .with_value::<String>()
-    ///         .request(&e)
+    ///         .request(e)
     ///         .retrieve_value(|res| result = Some(res));
     ///     result
     /// }
@@ -1010,13 +1010,13 @@ impl<INNER: for<'a> IntoMultiRequest<'a>> MultiRequestBuilder<INNER> {
     ///
     /// ```
     /// #![feature(error_generic_member_access)]
-    /// use core::error::MultiRequestBuilder;
+    /// use core::error::{Error, MultiRequestBuilder, MultiResponse};
     ///
     /// fn get_string(e: &dyn Error) -> Option<String> {
     ///     let mut result = None;
     ///     MultiRequestBuilder::new()
     ///         .with_value::<String>()
-    ///         .request(&e)
+    ///         .request(e)
     ///         .retrieve_value(|res| result = Some(res));
     ///     result
     /// }

library/coretests/tests/error.rs

@@ -105,3 +105,30 @@ fn test_error_combined_access_concrete() {
     assert_eq!(u8_val, None);
     assert_eq!(valid_ref.unwrap(), Valid);
 }
+
+#[test]
+fn test_error_combined_access_dyn() {
+    let obj = SomeConcreteType { some_string: "hello".to_owned() };
+    let obj: &dyn Error = &obj;
+
+    let mut string_val = None;
+    let mut string_ref = None;
+    let mut u8_val = None;
+    let mut valid_ref = None;
+
+    MultiRequestBuilder::new()
+        .with_value::<String>()
+        .with_ref::<String>()
+        .with_value::<u8>()
+        .with_ref::<Valid>()
+        .request(&obj)
+        .retrieve_value::<String>(|val| string_val = Some(val))
+        .retrieve_ref::<String>(|val| string_ref = Some(val))
+        .retrieve_value::<u8>(|val| u8_val = Some(val))
+        .retrieve_ref::<Valid>(|val| valid_ref = Some(val));
+
+    assert_eq!(string_ref.unwrap(), "hello");
+    assert_eq!(string_val.unwrap(), "bye");
+    assert_eq!(u8_val, None);
+    assert_eq!(valid_ref.unwrap(), Valid);
+}

tests/codegen-llvm/error-provide.rs

@@ -59,6 +59,7 @@ impl std::error::Error for MyError {
 pub fn provide_multi(
     e: &dyn std::error::Error,
 ) -> (Option<&[u8; 0]>, Option<&[u8; 1]>, Option<&[u8; 2]>) {
+    let (mut bt1, mut bt2, mut bt3) = (None, None, None);
     let mut value = core::error::MultiRequestBuilder::new()
         .with_ref::<[u8; 0]>()
         .with_ref::<[u8; 1]>()
@@ -68,17 +69,10 @@ pub fn provide_multi(
         .with_ref::<[u8; 5]>()
         .with_ref::<[u8; 6]>()
         .with_ref::<[u8; 7]>()
-        .request(e);
-    let (mut bt1, mut bt2, mut bt3) = (None, None, None);
-    value.consume_ref(|b| {
-        bt1 = Some(b);
-    });
-    value.consume_ref(|b| {
-        bt2 = Some(b);
-    });
-    value.consume_ref(|b| {
-        bt3 = Some(b);
-    });
+        .request(e)
+        .retrieve_ref(|b| bt1 = Some(b))
+        .retrieve_ref(|b| bt2 = Some(b))
+        .retrieve_ref(|b| bt3 = Some(b));
     (bt1, bt2, bt3)
 }