Skip to content

Commit

Permalink
Update forward tests to reflect provide API changes
Browse files Browse the repository at this point in the history
  • Loading branch information
MegaBluejay committed Aug 15, 2023
1 parent b3e425c commit 7688e66
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion impl/doc/error.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,6 @@ assert!(forwarded.source().unwrap().is::<Simple>());
let forwarded_with_backtrace = CompoundError::ForwardedExplicitSourceWithBacktrace { explicit_source: WithSourceAndBacktrace { source: Simple, backtrace: Backtrace::capture() } };
assert!(forwarded_with_backtrace.source().is_some());
assert!(forwarded_with_backtrace.source().unwrap().is::<Simple>());
assert!(any::request_ref::<Backtrace>(&forwarded_with_backtrace).is_some());
assert!(request_ref::<Backtrace>(&forwarded_with_backtrace).is_some());
# }
```
28 changes: 14 additions & 14 deletions tests/error/nightly/derives_forward.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::any;
use core::error::{request_ref, request_value};

use super::*;

Expand All @@ -19,7 +19,7 @@ struct StructAttr {

impl StructAttr {
fn get_source_backtrace(&self) -> &Backtrace {
any::request_ref(&self.source.source).unwrap()
request_ref(&self.source.source).unwrap()
}
}

Expand All @@ -35,8 +35,8 @@ fn struct_attr() {

assert!(err.source().is_some());
assert!(err.source().unwrap().is::<BacktraceErr>());
assert!(any::request_ref::<Backtrace>(&err).is_some());
assert_eq!(any::request_value::<i32>(&err), Some(42));
assert!(request_ref::<Backtrace>(&err).is_some());
assert_eq!(request_value::<i32>(&err), Some(42));
assert_bt!(==, err, .get_source_backtrace);
}

Expand All @@ -56,7 +56,7 @@ enum EnumAttr {

impl EnumAttr {
fn get_source_backtrace(&self) -> &Backtrace {
any::request_ref(match self {
request_ref(match self {
Self::A { source } => &source.source,
Self::B { source } => &source.source,
})
Expand All @@ -83,14 +83,14 @@ fn enum_attr() {

assert!(err_a.source().is_some());
assert!(err_a.source().unwrap().is::<BacktraceErr>());
assert!(any::request_ref::<Backtrace>(&err_a).is_some());
assert_eq!(any::request_value::<i32>(&err_a), Some(42));
assert!(request_ref::<Backtrace>(&err_a).is_some());
assert_eq!(request_value::<i32>(&err_a), Some(42));
assert_bt!(==, err_a, .get_source_backtrace);

assert!(err_b.source().is_some());
assert!(err_b.source().unwrap().is::<BacktraceErr>());
assert!(any::request_ref::<Backtrace>(&err_b).is_some());
assert_eq!(any::request_value::<i32>(&err_b), Some(42));
assert!(request_ref::<Backtrace>(&err_b).is_some());
assert_eq!(request_value::<i32>(&err_b), Some(42));
assert_bt!(==, err_b, .get_source_backtrace);
}

Expand All @@ -110,7 +110,7 @@ enum VariantAttr {

impl VariantAttr {
fn get_source_backtrace(&self) -> &Backtrace {
any::request_ref(match self {
request_ref(match self {
Self::A { source } => &source.source,
Self::B { source } => &source.source,
})
Expand All @@ -137,13 +137,13 @@ fn variant_attr() {

assert!(err_a.source().is_some());
assert!(err_a.source().unwrap().is::<BacktraceErr>());
assert!(any::request_ref::<Backtrace>(&err_a).is_some());
assert_eq!(any::request_value::<i32>(&err_a), Some(42));
assert!(request_ref::<Backtrace>(&err_a).is_some());
assert_eq!(request_value::<i32>(&err_a), Some(42));
assert_bt!(==, err_a, .get_source_backtrace);

assert!(err_b.source().is_some());
assert!(err_b.source().unwrap().is::<Inner>());
assert!(any::request_ref::<Backtrace>(&err_b).is_some());
assert_eq!(any::request_value::<i32>(&err_b), Some(42));
assert!(request_ref::<Backtrace>(&err_b).is_some());
assert_eq!(request_value::<i32>(&err_b), Some(42));
assert_bt!(==, err_b, .get_source_backtrace);
}

0 comments on commit 7688e66

Please sign in to comment.