diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2023-01-17 22:30:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-17 22:30:32 +0000 |
commit | 326cc2846982db68378188b135a57a1e2e4eb6a0 (patch) | |
tree | 74b35f25c2bf55ab1f00fac536a6a972dbfaead7 /tests/test_ensure.rs | |
parent | fe6dce880f9fece5a99e477c9214a58dd9d96f86 (diff) | |
parent | 7d05dd2f2cfeb736dbdbf659634e56e1b4e5e7e0 (diff) | |
download | anyhow-326cc2846982db68378188b135a57a1e2e4eb6a0.tar.gz |
Upgrade anyhow to 1.0.68 am: 85b5e2f6c5 am: 1cc8d7544c am: 7d05dd2f2c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/anyhow/+/2391492
Change-Id: Ie1e2789848b1bd24e32408793058dbe5ba370e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tests/test_ensure.rs')
-rw-r--r-- | tests/test_ensure.rs | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/tests/test_ensure.rs b/tests/test_ensure.rs index 4bb12f9..de867f7 100644 --- a/tests/test_ensure.rs +++ b/tests/test_ensure.rs @@ -1,13 +1,13 @@ #![allow( + clippy::bool_to_int_with_if, clippy::diverging_sub_expression, clippy::if_same_then_else, clippy::ifs_same_cond, clippy::items_after_statements, clippy::let_and_return, - clippy::let_underscore_drop, - clippy::logic_bug, clippy::match_bool, clippy::never_loop, + clippy::overly_complex_bool_expr, clippy::redundant_closure_call, clippy::redundant_pattern_matching, clippy::too_many_lines, @@ -17,10 +17,12 @@ irrefutable_let_patterns )] +use self::Enum::Generic; use anyhow::{anyhow, ensure, Chain, Error, Result}; -use std::fmt::Debug; +use std::fmt::{self, Debug}; use std::iter; use std::marker::{PhantomData, PhantomData as P}; +use std::mem; use std::ops::Add; use std::ptr; @@ -43,6 +45,24 @@ trait Trait: Sized { impl<T> Trait for T {} +enum Enum<T: ?Sized> { + #[allow(dead_code)] + Thing(PhantomData<T>), + Generic, +} + +impl<T: ?Sized> PartialEq for Enum<T> { + fn eq(&self, rhs: &Self) -> bool { + mem::discriminant(self) == mem::discriminant(rhs) + } +} + +impl<T: ?Sized> Debug for Enum<T> { + fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { + formatter.write_str("Generic") + } +} + #[track_caller] fn assert_err<T: Debug>(result: impl FnOnce() -> Result<T>, expected: &'static str) { let actual = result().unwrap_err().to_string(); @@ -355,27 +375,27 @@ fn test_path() { let test = || Ok(ensure!(E::U::<u8,>>E::U)); assert_err(test, "Condition failed: `E::U::<u8> > E::U` (U vs U)"); - let test = || Ok(ensure!(PhantomData::<dyn Debug + Sync> != PhantomData)); + let test = || Ok(ensure!(Generic::<dyn Debug + Sync> != Generic)); assert_err( test, - "Condition failed: `PhantomData::<dyn Debug + Sync> != PhantomData` (PhantomData vs PhantomData)", + "Condition failed: `Generic::<dyn Debug + Sync> != Generic` (Generic vs Generic)", ); - let test = || Ok(ensure!(PhantomData::<dyn Fn() + Sync> != PhantomData)); + let test = || Ok(ensure!(Generic::<dyn Fn() + Sync> != Generic)); assert_err( test, - "Condition failed: `PhantomData::<dyn Fn() + Sync> != PhantomData` (PhantomData vs PhantomData)", + "Condition failed: `Generic::<dyn Fn() + Sync> != Generic` (Generic vs Generic)", ); #[rustfmt::skip] let test = || { Ok(ensure!( - PhantomData::<dyn Fn::() + ::std::marker::Sync> != PhantomData + Generic::<dyn Fn::() + ::std::marker::Sync> != Generic )) }; assert_err( test, - "Condition failed: `PhantomData::<dyn Fn() + ::std::marker::Sync> != PhantomData` (PhantomData vs PhantomData)", + "Condition failed: `Generic::<dyn Fn() + ::std::marker::Sync> != Generic` (Generic vs Generic)", ); } @@ -408,7 +428,7 @@ fn test_trailer() { let test = || Ok(ensure!(PhantomData::<u8> {} != PhantomData)); assert_err( test, - "Condition failed: `PhantomData::<u8> {} != PhantomData` (PhantomData vs PhantomData)", + "Condition failed: `PhantomData::<u8> {} != PhantomData` (PhantomData<u8> vs PhantomData<u8>)", ); let result = Ok::<_, Error>(1); @@ -596,7 +616,7 @@ fn test_as() { }; assert_err( test, - "Condition failed: `PhantomData as PhantomData<<i32 as ToOwned>::Owned> != PhantomData` (PhantomData vs PhantomData)", + "Condition failed: `PhantomData as PhantomData<<i32 as ToOwned>::Owned> != PhantomData` (PhantomData<i32> vs PhantomData<i32>)", ); macro_rules! int { |