From 787efb3662ee668071c52c4831ddc6563eec1e51 Mon Sep 17 00:00:00 2001 From: timofey Date: Sun, 15 Oct 2023 17:41:21 +0000 Subject: [PATCH] simplify select_second --- src/func/instances/future.rs | 8 +++----- src/func/instances/tryfuture.rs | 9 +++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/func/instances/future.rs b/src/func/instances/future.rs index 7358f05..702e65a 100644 --- a/src/func/instances/future.rs +++ b/src/func/instances/future.rs @@ -176,13 +176,11 @@ mod future_tests { #[test] fn select_second() { - match futures::executor::block_on(T::select( + let res = futures::executor::block_on(T::select( Box::pin(futures::future::pending::()), Box::pin(futures::future::ready(2)), - )) { - Selected::A(_, _) => panic!("first future ready"), - Selected::B(_, b) => assert_eq!(b, 2), - } + )); + assert!(matches!(res, Selected::B(_, 2))); } #[test] diff --git a/src/func/instances/tryfuture.rs b/src/func/instances/tryfuture.rs index 09a0fac..77f2e6c 100644 --- a/src/func/instances/tryfuture.rs +++ b/src/func/instances/tryfuture.rs @@ -246,15 +246,12 @@ mod tryfuture_tests { #[test] fn select_second() { - match futures::executor::block_on(T::select( + let res = futures::executor::block_on(T::select( Box::pin(futures::future::pending::>()), Box::pin(futures::future::ready(Ok(2))), )) - .unwrap() - { - Selected::A(_, _) => panic!("first future ready"), - Selected::B(_, b) => assert_eq!(b, 2), - } + .unwrap(); + assert!(matches!(res, Selected::B(_, 2))); } #[test]