From e01c92920882221b348de0d807d033aebe2aa5c5 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 28 Jul 2023 13:52:50 +0900 Subject: [PATCH] Allow to use EitherOrBoth to mean the same as EitherOrBoth --- src/either_or_both.rs | 2 +- tests/merge_join.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/either_or_both.rs b/src/either_or_both.rs index d39747eaa..9dbc880d3 100644 --- a/src/either_or_both.rs +++ b/src/either_or_both.rs @@ -6,7 +6,7 @@ use either::Either; /// Value that either holds a single A or B, or both. #[derive(Clone, PartialEq, Eq, Hash, Debug)] -pub enum EitherOrBoth { +pub enum EitherOrBoth { /// Both values are present. Both(A, B), /// Only the left value of type `A` is present. diff --git a/tests/merge_join.rs b/tests/merge_join.rs index 870e1faff..776252fc5 100644 --- a/tests/merge_join.rs +++ b/tests/merge_join.rs @@ -5,7 +5,7 @@ use itertools::EitherOrBoth; fn empty() { let left: Vec = vec![]; let right: Vec = vec![]; - let expected_result: Vec> = vec![]; + let expected_result: Vec> = vec![]; let actual_result = merge_join_by(left, right, |l, r| l.cmp(r)).collect::>(); assert_eq!(expected_result, actual_result); } @@ -14,7 +14,7 @@ fn empty() { fn left_only() { let left: Vec = vec![1, 2, 3]; let right: Vec = vec![]; - let expected_result: Vec> = vec![ + let expected_result: Vec> = vec![ EitherOrBoth::Left(1), EitherOrBoth::Left(2), EitherOrBoth::Left(3), @@ -27,7 +27,7 @@ fn left_only() { fn right_only() { let left: Vec = vec![]; let right: Vec = vec![1, 2, 3]; - let expected_result: Vec> = vec![ + let expected_result: Vec> = vec![ EitherOrBoth::Right(1), EitherOrBoth::Right(2), EitherOrBoth::Right(3), @@ -40,7 +40,7 @@ fn right_only() { fn first_left_then_right() { let left: Vec = vec![1, 2, 3]; let right: Vec = vec![4, 5, 6]; - let expected_result: Vec> = vec![ + let expected_result: Vec> = vec![ EitherOrBoth::Left(1), EitherOrBoth::Left(2), EitherOrBoth::Left(3), @@ -56,7 +56,7 @@ fn first_left_then_right() { fn first_right_then_left() { let left: Vec = vec![4, 5, 6]; let right: Vec = vec![1, 2, 3]; - let expected_result: Vec> = vec![ + let expected_result: Vec> = vec![ EitherOrBoth::Right(1), EitherOrBoth::Right(2), EitherOrBoth::Right(3), @@ -72,7 +72,7 @@ fn first_right_then_left() { fn interspersed_left_and_right() { let left: Vec = vec![1, 3, 5]; let right: Vec = vec![2, 4, 6]; - let expected_result: Vec> = vec![ + let expected_result: Vec> = vec![ EitherOrBoth::Left(1), EitherOrBoth::Right(2), EitherOrBoth::Left(3), @@ -88,7 +88,7 @@ fn interspersed_left_and_right() { fn overlapping_left_and_right() { let left: Vec = vec![1, 3, 4, 6]; let right: Vec = vec![2, 3, 4, 5]; - let expected_result: Vec> = vec![ + let expected_result: Vec> = vec![ EitherOrBoth::Left(1), EitherOrBoth::Right(2), EitherOrBoth::Both(3, 3),