From 0e6be6a28303e749c3ec79964bda4f900bd6f7b6 Mon Sep 17 00:00:00 2001 From: Paul Louth Date: Thu, 21 Oct 2021 12:46:40 +0100 Subject: [PATCH] Rename Seq back to Seq1 --- .../Prelude_Collections.cs | 36 ++++++++++++++----- LanguageExt.Tests/HashMapTests.cs | 2 +- LanguageExt.Tests/IssuesTests.cs | 10 +++--- LanguageExt.Tests/MapTests.cs | 4 +-- LanguageExt.Tests/MonadTests.cs | 4 +-- LanguageExt.Tests/Seq.Arr.Tests.cs | 2 +- LanguageExt.Tests/Seq.Cons.Tests.cs | 2 +- LanguageExt.Tests/Seq.Enumerable.Tests.cs | 18 +++++----- LanguageExt.Tests/Seq.IList.Tests.cs | 6 ++-- LanguageExt.Tests/Seq.Lst.Tests.cs | 2 +- LanguageExt.Tests/Seq.Module.Tests.cs | 2 +- LanguageExt.Tests/SeqTests.cs | 26 +++++++------- LanguageExt.Tests/SeqTypes/SeqListTests.cs | 8 ++--- .../Traverse/SeqT/Collections/IEnumerable.cs | 2 +- .../Transformer/Traverse/SeqT/Sync/Either.cs | 2 +- .../Traverse/SeqT/Sync/EitherUnsafe.cs | 2 +- .../Transformer/Traverse/SeqT/Sync/Option.cs | 2 +- .../Traverse/SeqT/Sync/OptionUnsafe.cs | 2 +- .../Transformer/Traverse/SeqT/Sync/Try.cs | 2 +- .../Traverse/SeqT/Sync/TryOption.cs | 2 +- .../Traverse/SeqT/Sync/Validation.cs | 2 +- .../SeqT/Sync/ValidationWithMonoid.cs | 4 +-- .../ValidationMonoid/Collections/Arr.cs | 6 ++-- .../ValidationMonoid/Collections/HashSet.cs | 4 +-- .../Collections/IEnumerable.cs | 4 +-- .../ValidationMonoid/Collections/Lst.cs | 6 ++-- .../ValidationMonoid/Collections/Que.cs | 6 ++-- .../ValidationMonoid/Collections/Seq.cs | 6 ++-- .../ValidationMonoid/Collections/Set.cs | 4 +-- .../ValidationMonoid/Collections/Stck.cs | 4 +-- .../Traverse/ValidationMonoid/Sync/Either.cs | 8 ++--- .../ValidationMonoid/Sync/EitherUnsafe.cs | 8 ++--- .../ValidationMonoid/Sync/Identity.cs | 4 +-- .../Traverse/ValidationMonoid/Sync/Option.cs | 4 +-- .../ValidationMonoid/Sync/OptionUnsafe.cs | 4 +-- LanguageExt.Tests/ValidationTests.cs | 4 +-- 36 files changed, 116 insertions(+), 98 deletions(-) diff --git a/LanguageExt.Core/Immutable Collections/Prelude_Collections.cs b/LanguageExt.Core/Immutable Collections/Prelude_Collections.cs index bf452ef6b..e9d86d5fb 100644 --- a/LanguageExt.Core/Immutable Collections/Prelude_Collections.cs +++ b/LanguageExt.Core/Immutable Collections/Prelude_Collections.cs @@ -1099,17 +1099,24 @@ public static Seq Seq(A a, A b, A c, A d, A e, A f, A g, A h, params A[] t System.Array.Copy(tail, 0, arr, 12, tail.Length); return new Seq(new SeqStrict(arr, 4, 8 + tail.Length, 0, 0)); } - + /// - /// Construct a sequence from a nullable - /// HasValue == true : [x] - /// HasValue == false : [] + /// Construct a sequence from an Enumerable + /// Deals with `value == null` by returning `[]` and also memoizes the + /// items in the enumerable as they're being consumed. /// [Pure] - public static Seq toSeq(A? value) where A : struct => - value == null - ? Empty - : LSeq.FromSingleValue(value.Value); + public static Seq Seq(IEnumerable value) => + value switch + { + null => Empty, + Seq seq => seq, + Arr arr => LSeq.FromArray(arr.Value), + A[] array => toSeq(array), + IList list => toSeq(list), + ICollection coll => toSeq(coll), + _ => new Seq(value) + }; /// /// Construct a sequence from an Enumerable @@ -1128,7 +1135,18 @@ value switch ICollection coll => toSeq(coll), _ => new Seq(value) }; - + + /// + /// Construct a sequence from a nullable + /// HasValue == true : [x] + /// HasValue == false : [] + /// + [Pure] + public static Seq toSeq(A? value) where A : struct => + value == null + ? Empty + : LSeq.FromSingleValue(value.Value); + /// /// Construct a sequence from an array /// diff --git a/LanguageExt.Tests/HashMapTests.cs b/LanguageExt.Tests/HashMapTests.cs index 2409a01a9..76968ca3e 100644 --- a/LanguageExt.Tests/HashMapTests.cs +++ b/LanguageExt.Tests/HashMapTests.cs @@ -232,7 +232,7 @@ public void EqualsTest() public void FetchBack() { var init = Seq(69, 1477); - var rmv = Seq(69); + var rmv = Seq1(69); var map = toHashMap(init.Zip(Enumerable.Repeat(1, int.MaxValue))); diff --git a/LanguageExt.Tests/IssuesTests.cs b/LanguageExt.Tests/IssuesTests.cs index b8625cd27..1b31e72f0 100644 --- a/LanguageExt.Tests/IssuesTests.cs +++ b/LanguageExt.Tests/IssuesTests.cs @@ -76,8 +76,8 @@ static void EqPar() } static Writer, Seq, Seq> multWithLog(Seq input) => - from _ in Writer(0, Seq("Start")) - let c = input.Map(i => Writer(i * 10, Seq($"Number: {i}"))) + from _ in Writer(0, Seq1("Start")) + let c = input.Map(i => Writer(i * 10, Seq1($"Number: {i}"))) from r in c.Sequence() select r; @@ -346,9 +346,9 @@ public void Test1() var mc = from x in ma from y in mb - from _1 in tell, Seq>(Seq("Hello")) - from _2 in tell, Seq>(Seq("World")) - from _3 in tell, Seq>(Seq($"the result is {x + y}")) + from _1 in tell, Seq>(Seq1("Hello")) + from _2 in tell, Seq>(Seq1("World")) + from _3 in tell, Seq>(Seq1($"the result is {x + y}")) select x + y; var r = mc(); diff --git a/LanguageExt.Tests/MapTests.cs b/LanguageExt.Tests/MapTests.cs index 45a8438b4..866a95a40 100644 --- a/LanguageExt.Tests/MapTests.cs +++ b/LanguageExt.Tests/MapTests.cs @@ -250,7 +250,7 @@ public void MapValuesTest() { var m = Map((1, 1), (2, 2), (3, 3), (4, 4), (5, 5)); - var vs = Seq(m.Values); + var vs = toSeq(m.Values); Assert.True(vs.Head == 1); Assert.True(vs.Tail.Head == 2); @@ -265,7 +265,7 @@ public void MapKeysTest() { var m = Map((1, 1), (2, 2), (3, 3), (4, 4), (5, 5)); - var vs = Seq(m.Keys); + var vs = toSeq(m.Keys); Assert.True(vs.Head == 1); Assert.True(vs.Tail.Head == 2); diff --git a/LanguageExt.Tests/MonadTests.cs b/LanguageExt.Tests/MonadTests.cs index 2c47ef3a7..1e97e0d09 100644 --- a/LanguageExt.Tests/MonadTests.cs +++ b/LanguageExt.Tests/MonadTests.cs @@ -36,8 +36,8 @@ public void WriterTest() (value, output, false); static Writer, Seq, Seq> multWithLog(Seq input) => - from _ in writer(0, Seq("Start")) - let c = input.Map(i => writer(i * 10, Seq($"Number: {i}"))) + from _ in writer(0, Seq1("Start")) + let c = input.Map(i => writer(i * 10, Seq1($"Number: {i}"))) from r in c.Sequence() select r; diff --git a/LanguageExt.Tests/Seq.Arr.Tests.cs b/LanguageExt.Tests/Seq.Arr.Tests.cs index f50134f24..9e63eafbb 100644 --- a/LanguageExt.Tests/Seq.Arr.Tests.cs +++ b/LanguageExt.Tests/Seq.Arr.Tests.cs @@ -11,7 +11,7 @@ public void TestEmpty() { var arr = Arr.empty(); - var seq = Seq(arr); + var seq = toSeq(arr); Assert.True(seq.IsEmpty); Assert.True(seq.Tail.IsEmpty); diff --git a/LanguageExt.Tests/Seq.Cons.Tests.cs b/LanguageExt.Tests/Seq.Cons.Tests.cs index c163cbaef..e5404913d 100644 --- a/LanguageExt.Tests/Seq.Cons.Tests.cs +++ b/LanguageExt.Tests/Seq.Cons.Tests.cs @@ -11,7 +11,7 @@ public void TestEmpty() { var arr = Seq.Empty; - var seq = Seq(arr); + var seq = Seq1(arr); Assert.True(seq.IsEmpty); Assert.True(seq.Tail.IsEmpty); diff --git a/LanguageExt.Tests/Seq.Enumerable.Tests.cs b/LanguageExt.Tests/Seq.Enumerable.Tests.cs index 734371de4..131cabe95 100644 --- a/LanguageExt.Tests/Seq.Enumerable.Tests.cs +++ b/LanguageExt.Tests/Seq.Enumerable.Tests.cs @@ -26,7 +26,7 @@ public void TestEmpty() { var arr = EmptyList; - var seq = Seq(arr); + var seq = Seq1(arr); Assert.True(seq.IsEmpty); Assert.True(seq.Tail.IsEmpty); @@ -61,7 +61,7 @@ public void TestOne() { var arr = OneItem; - var seq = Seq(arr); + var seq = toSeq(arr); Assert.True(seq.Head == 1); Assert.True(seq.Tail.IsEmpty); @@ -100,7 +100,7 @@ public void TestMore() { var arr = FiveItems; - var seq = Seq(arr); + var seq = toSeq(arr); Assert.True(seq.Head == 1); Assert.True(seq.Tail.Head == 2); @@ -185,7 +185,7 @@ public void FilterTest() where x % 2 == 0 select x; - var expected = Seq(EvenItems); + var expected = toSeq(EvenItems); Assert.True(expected == seq2); Assert.True(expected == seq3); @@ -195,12 +195,12 @@ public void FilterTest() [Fact] public void BindTest() { - var seq1 = Seq(TenHundred); - var seq2 = Seq(FiveItems); + var seq1 = toSeq(TenHundred); + var seq2 = toSeq(FiveItems); var seq3 = seq1.Bind(x => seq2.Map(y => x * y)); - var expected = Seq(BoundItems); + var expected = toSeq(BoundItems); Assert.True(seq3 == expected); } @@ -208,7 +208,7 @@ public void BindTest() [Fact] public void FoldTest1() { - var seq = Seq(FiveItems); + var seq = toSeq(FiveItems); var res1 = seq.Fold(1, (s, x) => s * x); var res2 = seq.FoldBack(1, (s, x) => s * x); @@ -220,7 +220,7 @@ public void FoldTest1() [Fact] public void FoldTest2() { - var seq = Seq(abcdeStrs); + var seq = toSeq(abcdeStrs); var res1 = seq.Fold("", (s, x) => s + x); var res2 = seq.FoldBack("", (s, x) => s + x); diff --git a/LanguageExt.Tests/Seq.IList.Tests.cs b/LanguageExt.Tests/Seq.IList.Tests.cs index c38389c72..f186dad1f 100644 --- a/LanguageExt.Tests/Seq.IList.Tests.cs +++ b/LanguageExt.Tests/Seq.IList.Tests.cs @@ -10,9 +10,9 @@ public class SeqIListTests [Fact] public void TestEmpty() { - var arr = Seq(new List()); + var arr = toSeq(new List()); - var seq = Seq(arr); + var seq = toSeq(arr); Assert.True(seq.IsEmpty); Assert.True(seq.Tail.IsEmpty); @@ -206,7 +206,7 @@ public void FoldTest1() [Fact] public void FoldTest2() { - var seq = Seq(new List() { "a", "b", "c", "d", "e" }); + var seq = toSeq(new List() { "a", "b", "c", "d", "e" }); var res1 = seq.Fold("", (s, x) => s + x); var res2 = seq.FoldBack("", (s, x) => s + x); diff --git a/LanguageExt.Tests/Seq.Lst.Tests.cs b/LanguageExt.Tests/Seq.Lst.Tests.cs index 2d5144958..a6b8fbb6d 100644 --- a/LanguageExt.Tests/Seq.Lst.Tests.cs +++ b/LanguageExt.Tests/Seq.Lst.Tests.cs @@ -11,7 +11,7 @@ public void TestEmpty() { var arr = List.empty(); - var seq = Seq(arr); + var seq = toSeq(arr); Assert.True(seq.IsEmpty); Assert.True(seq.Tail.IsEmpty); diff --git a/LanguageExt.Tests/Seq.Module.Tests.cs b/LanguageExt.Tests/Seq.Module.Tests.cs index 5e41382cc..054616b77 100644 --- a/LanguageExt.Tests/Seq.Module.Tests.cs +++ b/LanguageExt.Tests/Seq.Module.Tests.cs @@ -183,7 +183,7 @@ public void ParallelTests() { var sum = Range(1, 10000).Sum(); - var seq = Seq(Range(1, 10000)); + var seq = toSeq(Range(1, 10000)); var tasks = new List>(); foreach(var x in Range(1, 1000)) diff --git a/LanguageExt.Tests/SeqTests.cs b/LanguageExt.Tests/SeqTests.cs index f3a2beffe..b9c1f0d30 100644 --- a/LanguageExt.Tests/SeqTests.cs +++ b/LanguageExt.Tests/SeqTests.cs @@ -14,8 +14,8 @@ public void ObjectExists() { var x = "test"; - Assert.True(Seq(x).Count() == 1); - Assert.True(Seq(x).Head() == x); + Assert.True(toSeq(x).Count() == 1); + Assert.True(Seq1(x).Head() == x); } [Fact] @@ -23,7 +23,7 @@ public void ObjectNull() { string x = null; - Assert.True(Seq(x).Count() == 0); + Assert.True(toSeq(x).Count() == 0); } [Fact] @@ -243,7 +243,7 @@ public void GetEnumeratorTest() [Fact] public void AddTest() { - var a = Seq("a"); + var a = Seq1("a"); var b = a.Add("b"); @@ -258,7 +258,7 @@ public void AddTest() [Fact] public void ConsTest() { - var a = Seq("a"); + var a = Seq1("a"); var b = "b".Cons(a); @@ -284,14 +284,14 @@ public void InitStrictTest() Assert.True(sb == Seq(1, 2, 3, 4)); Assert.True(sc == Seq(1, 2, 3)); Assert.True(sd == Seq(1, 2)); - Assert.True(se == Seq(1)); + Assert.True(se == Seq1(1)); Assert.True(sf == Empty); } [Fact] public void InitLazyTest() { - var sa = Seq(Range(1, 5)); + var sa = toSeq(Range(1, 5)); var sb = sa.Init; // [1,2,3,4] var sc = sb.Init; // [1,2,3] @@ -302,14 +302,14 @@ public void InitLazyTest() Assert.True(sb == Seq(1, 2, 3, 4)); Assert.True(sc == Seq(1, 2, 3)); Assert.True(sd == Seq(1, 2)); - Assert.True(se == Seq(1)); + Assert.True(se == Seq1(1)); Assert.True(sf == Empty); } [Fact] public void InitConcatTest() { - var sa = Seq(Range(1, 2)) + Seq(Range(3, 3)); + var sa = toSeq(Range(1, 2)) + toSeq(Range(3, 3)); var sb = sa.Init; // [1,2,3,4] var sc = sb.Init; // [1,2,3] @@ -320,15 +320,15 @@ public void InitConcatTest() Assert.True(sb == Seq(1, 2, 3, 4)); Assert.True(sc == Seq(1, 2, 3)); Assert.True(sd == Seq(1, 2)); - Assert.True(se == Seq(1)); + Assert.True(se == Seq1(1)); Assert.True(sf == Empty); } [Fact] public void HashTest() { - var s1 = Seq("test"); - var s2 = Seq("test"); + var s1 = Seq1("test"); + var s2 = Seq1("test"); Assert.True(s1.GetHashCode() == s2.GetHashCode()); } @@ -425,7 +425,7 @@ public void CheckItems() var xs = Seq(); Assert.True(xs.Count == 0); - xs = Seq(0); + xs = Seq1(0); Assert.True(xs.Count == 1); Assert.True(xs[0] == 0); diff --git a/LanguageExt.Tests/SeqTypes/SeqListTests.cs b/LanguageExt.Tests/SeqTypes/SeqListTests.cs index ac797e0bd..3675797ab 100644 --- a/LanguageExt.Tests/SeqTypes/SeqListTests.cs +++ b/LanguageExt.Tests/SeqTypes/SeqListTests.cs @@ -9,7 +9,7 @@ public class SeqListTests [Fact] public void Take_ZeroFromNonempty_Empty() { - var seq = Seq(new List { 0 }); + var seq = toSeq(new List { 0 }); var actual = seq.Take(0); Assert.Equal(actual, SeqEmpty.Default); } @@ -17,7 +17,7 @@ public void Take_ZeroFromNonempty_Empty() [Fact] public void Take_NegativeFromNonempty_Empty() { - var seq = Seq(new List { 0 }); + var seq = toSeq(new List { 0 }); var actual = seq.Take(-1); Assert.Equal(actual, SeqEmpty.Default); } @@ -25,8 +25,8 @@ public void Take_NegativeFromNonempty_Empty() [Fact] public void Skip_NegativeFromNonempty_Unchanged() { - var expected = Seq(new List { 0 }); - var actual = expected.Skip(-1); + var expected = toSeq(new List { 0 }); + var actual = expected.Skip(-1); Assert.Equal(actual, expected); } diff --git a/LanguageExt.Tests/Transformer/Traverse/SeqT/Collections/IEnumerable.cs b/LanguageExt.Tests/Transformer/Traverse/SeqT/Collections/IEnumerable.cs index 8740443e2..c8deea839 100644 --- a/LanguageExt.Tests/Transformer/Traverse/SeqT/Collections/IEnumerable.cs +++ b/LanguageExt.Tests/Transformer/Traverse/SeqT/Collections/IEnumerable.cs @@ -34,7 +34,7 @@ public void IEnumerableSeqCrossProduct() Seq(2, 20), Seq(2, 30)); - Assert.True(mb.Map(Prelude.Seq) == mc.Map(Prelude.Seq)); + Assert.True(mb.Map(Prelude.Seq1) == mc.Map(Prelude.Seq1)); } [Fact] diff --git a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Either.cs b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Either.cs index 5e4cf7562..83cd81904 100644 --- a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Either.cs +++ b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Either.cs @@ -12,7 +12,7 @@ public void LeftIsSingletonLeft() { var ma = Left>(Error.New("alt")); var mb = ma.Sequence(); - var mc = Seq(Left(Error.New("alt"))); + var mc = Seq1(Left(Error.New("alt"))); Assert.True(mb == mc); } diff --git a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/EitherUnsafe.cs b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/EitherUnsafe.cs index fe3394bc8..e3ddd4c61 100644 --- a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/EitherUnsafe.cs +++ b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/EitherUnsafe.cs @@ -12,7 +12,7 @@ public void LeftIsSingletonLeft() { var ma = LeftUnsafe>(Error.New("alt")); var mb = ma.Sequence(); - var mc = Seq(LeftUnsafe(Error.New("alt"))); + var mc = Seq1(LeftUnsafe(Error.New("alt"))); Assert.True(mb == mc); } diff --git a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Option.cs b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Option.cs index cf57394c4..2d58a01ab 100644 --- a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Option.cs +++ b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Option.cs @@ -11,7 +11,7 @@ public void NoneIsSingletonNone() { var ma = Option>.None; var mb = ma.Sequence(); - var mc = Seq(Option.None); + var mc = Seq1(Option.None); Assert.True(mb == mc); } diff --git a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/OptionUnsafe.cs b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/OptionUnsafe.cs index 11b034f27..4d34b161d 100644 --- a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/OptionUnsafe.cs +++ b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/OptionUnsafe.cs @@ -11,7 +11,7 @@ public void NoneIsSingletonNone() { var ma = OptionUnsafe>.None; var mb = ma.Sequence(); - var mc = Seq(OptionUnsafe.None); + var mc = Seq1(OptionUnsafe.None); Assert.True(mb == mc); } diff --git a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Try.cs b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Try.cs index a35bcf44e..e1a6c6662 100644 --- a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Try.cs +++ b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Try.cs @@ -12,7 +12,7 @@ public void FailIsSingletonNone() { var ma = TryFail>(new Exception("fail")); var mb = ma.Sequence(); - var mc = Seq(TryFail(new Exception("fail"))); + var mc = Seq1(TryFail(new Exception("fail"))); Assert.True(mb == mc); } diff --git a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/TryOption.cs b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/TryOption.cs index 68e6718ff..336d18c74 100644 --- a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/TryOption.cs +++ b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/TryOption.cs @@ -11,7 +11,7 @@ public void FailIsSingletonNone() { var ma = TryOptionFail>(new Exception("fail")); var mb = ma.Sequence(); - var mc = Seq(TryOptionFail(new Exception("fail"))); + var mc = Seq1(TryOptionFail(new Exception("fail"))); Assert.True(mb == mc); } diff --git a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Validation.cs b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Validation.cs index d47d8cf6f..3c98d1d88 100644 --- a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Validation.cs +++ b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/Validation.cs @@ -12,7 +12,7 @@ public void FailIsSingletonFail() { var ma = Fail>(Error.New("alt")); var mb = ma.Sequence(); - var mc = Seq(Fail(Error.New("alt"))); + var mc = Seq1(Fail(Error.New("alt"))); Assert.True(mb == mc); } diff --git a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/ValidationWithMonoid.cs b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/ValidationWithMonoid.cs index d757fe773..047767dd7 100644 --- a/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/ValidationWithMonoid.cs +++ b/LanguageExt.Tests/Transformer/Traverse/SeqT/Sync/ValidationWithMonoid.cs @@ -11,9 +11,9 @@ public class ValidationWithMonoidSeq [Fact] public void FailIsSingletonFail() { - var ma = Fail, Seq, Seq>(Seq(Error.New("alt"))); + var ma = Fail, Seq, Seq>(Seq1(Error.New("alt"))); var mb = ma.Traverse(identity); - var mc = Seq(Fail, Seq, int>(Seq(Error.New("alt")))); + var mc = Seq1(Fail, Seq, int>(Seq1(Error.New("alt")))); Assert.True(mb == mc); } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Arr.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Arr.cs index 054059a38..f77e30bb9 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Arr.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Arr.cs @@ -26,7 +26,7 @@ public void ArraySuccessIsSuccessArray() [Fact] public void ArrayFailedIsFailedArray() { - var ma = Array(Fail, Seq, int>(Seq(Error.New("failed"))), Fail, Seq, int>(Seq(Error.New("failure")))); + var ma = Array(Fail, Seq, int>(Seq1(Error.New("failed"))), Fail, Seq, int>(Seq1(Error.New("failure")))); var mb = ma.Traverse(identity); var expected = Fail, Seq, Arr>(Seq(Error.New("failed"), Error.New("failure"))); Assert.Equal(expected, mb); @@ -35,9 +35,9 @@ public void ArrayFailedIsFailedArray() [Fact] public void ArrSuccAndFailIsFailedArr() { - var ma = Array(Fail, Seq, int>(Seq(Error.New("failed"))), Success, Seq, int>(12)); + var ma = Array(Fail, Seq, int>(Seq1(Error.New("failed"))), Success, Seq, int>(12)); var mb = ma.Traverse(identity); - Assert.Equal(Fail, Seq, Arr>(Seq(Error.New("failed"))), mb); + Assert.Equal(Fail, Seq, Arr>(Seq1(Error.New("failed"))), mb); } } } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/HashSet.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/HashSet.cs index da91554b2..6809c63b1 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/HashSet.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/HashSet.cs @@ -26,9 +26,9 @@ public void HashSetSuccessIsSuccessHashSet() [Fact] public void HashSetSuccAndFailIsFailedHashSet() { - var ma = HashSet(Fail, Seq, int>(Seq(Error.New("failed"))), Success, Seq, int>(12)); + var ma = HashSet(Fail, Seq, int>(Seq1(Error.New("failed"))), Success, Seq, int>(12)); var mb = ma.Traverse(identity); - Assert.Equal(Fail, Seq, HashSet>(Seq(Error.New("failed"))), mb); + Assert.Equal(Fail, Seq, HashSet>(Seq1(Error.New("failed"))), mb); } } } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/IEnumerable.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/IEnumerable.cs index 1a6b66819..a681ee302 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/IEnumerable.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/IEnumerable.cs @@ -29,9 +29,9 @@ public void IEnumerableSuccessIsSuccessIEnumerable() [Fact] public void IEnumerableSuccAndFailIsFailedIEnumerable() { - var ma = List(Fail, Seq, int>(Seq(Error.New("failed"))), Success, Seq, int>(12)).AsEnumerable(); + var ma = List(Fail, Seq, int>(Seq1(Error.New("failed"))), Success, Seq, int>(12)).AsEnumerable(); var mb = ma.Traverse(identity); - Assert.Equal(Fail, Seq, IEnumerable>(Seq(Error.New("failed"))), mb); + Assert.Equal(Fail, Seq, IEnumerable>(Seq1(Error.New("failed"))), mb); } } } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Lst.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Lst.cs index 3ab988f3f..a11f139ba 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Lst.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Lst.cs @@ -26,7 +26,7 @@ public void LstSuccessIsSuccessLst() [Fact] public void LstFailedIsFailedLst() { - var ma = List(Fail, Seq, int>(Seq(Error.New("failed"))), Fail, Seq, int>(Seq(Error.New("failure")))); + var ma = List(Fail, Seq, int>(Seq1(Error.New("failed"))), Fail, Seq, int>(Seq1(Error.New("failure")))); var mb = ma.Traverse(identity); var expected = Fail, Seq, Lst>(Seq(Error.New("failed"), Error.New("failure"))); Assert.Equal(expected, mb); @@ -35,9 +35,9 @@ public void LstFailedIsFailedLst() [Fact] public void LstSuccAndFailIsFailedLst() { - var ma = List(Fail, Seq, int>(Seq(Error.New("failed"))), Success, Seq, int>(12)); + var ma = List(Fail, Seq, int>(Seq1(Error.New("failed"))), Success, Seq, int>(12)); var mb = ma.Traverse(identity); - Assert.Equal(Fail, Seq, Lst>(Seq(Error.New("failed"))), mb); + Assert.Equal(Fail, Seq, Lst>(Seq1(Error.New("failed"))), mb); } } } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Que.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Que.cs index 126842189..7cee9954c 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Que.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Que.cs @@ -26,7 +26,7 @@ public void QueSuccessIsSuccessQue() [Fact] public void QueFailedIsFailedQue() { - var ma = Queue(Fail, Seq, int>(Seq(Error.New("failed"))), Fail, Seq, int>(Seq(Error.New("failure")))); + var ma = Queue(Fail, Seq, int>(Seq1(Error.New("failed"))), Fail, Seq, int>(Seq1(Error.New("failure")))); var mb = ma.Traverse(identity); var expected = Fail, Seq, Que>(Seq(Error.New("failed"), Error.New("failure"))); Assert.Equal(expected, mb); @@ -35,9 +35,9 @@ public void QueFailedIsFailedQue() [Fact] public void QueSuccAndFailIsFailedQue() { - var ma = Queue(Fail, Seq, int>(Seq(Error.New("failed"))), Success, Seq, int>(12)); + var ma = Queue(Fail, Seq, int>(Seq1(Error.New("failed"))), Success, Seq, int>(12)); var mb = ma.Traverse(identity); - Assert.Equal(Fail, Seq, Que>(Seq(Error.New("failed"))), mb); + Assert.Equal(Fail, Seq, Que>(Seq1(Error.New("failed"))), mb); } } } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Seq.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Seq.cs index 510ccec3f..f74dc2976 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Seq.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Seq.cs @@ -26,7 +26,7 @@ public void SeqSuccessIsSuccessSeq() [Fact] public void SeqFailedIsFailedSeq() { - var ma = Seq(Fail, Seq, int>(Seq(Error.New("failed"))), Fail, Seq, int>(Seq(Error.New("failuire")))); + var ma = Seq(Fail, Seq, int>(Seq1(Error.New("failed"))), Fail, Seq, int>(Seq1(Error.New("failuire")))); var mb = ma.Traverse(identity); var expected = Fail, Seq, Seq>(Seq(Error.New("failed"), Error.New("failuire"))); Assert.Equal(expected, mb); @@ -35,9 +35,9 @@ public void SeqFailedIsFailedSeq() [Fact] public void SeqSuccAndFailIsFailedSeq() { - var ma = Seq(Fail, Seq, int>(Seq(Error.New("failed"))), Success, Seq, int>(12)); + var ma = Seq(Fail, Seq, int>(Seq1(Error.New("failed"))), Success, Seq, int>(12)); var mb = ma.Traverse(identity); - Assert.Equal(Fail, Seq, Seq>(Seq(Error.New("failed"))), mb); + Assert.Equal(Fail, Seq, Seq>(Seq1(Error.New("failed"))), mb); } } } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Set.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Set.cs index 4f0125f5b..d5096684d 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Set.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Set.cs @@ -26,9 +26,9 @@ public void SetSuccessIsSuccessSet() [Fact] public void SetSuccAndFailIsFailedSet() { - var ma = Set(Fail, Seq, int>(Seq(Error.New("failed"))), Success, Seq, int>(12)); + var ma = Set(Fail, Seq, int>(Seq1(Error.New("failed"))), Success, Seq, int>(12)); var mb = ma.Traverse(identity); - Assert.Equal(Fail, Seq, Set>(Seq(Error.New("failed"))), mb); + Assert.Equal(Fail, Seq, Set>(Seq1(Error.New("failed"))), mb); } } } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Stck.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Stck.cs index a1afbab04..75bfda2d0 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Stck.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Collections/Stck.cs @@ -26,9 +26,9 @@ public void StckSuccessIsSuccessStck() [Fact] public void StckSuccAndFailIsFailedStck() { - var ma = Stack(Fail, Seq, int>(Seq(Error.New("failed"))), Success, Seq, int>(12)); + var ma = Stack(Fail, Seq, int>(Seq1(Error.New("failed"))), Success, Seq, int>(12)); var mb = ma.Traverse(identity); - Assert.Equal(Fail, Seq, Stck>(Seq(Error.New("failed"))), mb); + Assert.Equal(Fail, Seq, Stck>(Seq1(Error.New("failed"))), mb); } } } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Either.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Either.cs index e2f06f4dd..ade1f101f 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Either.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Either.cs @@ -10,9 +10,9 @@ public class Either [Fact] public void LeftIsSuccessLeft() { - var ma = Left, Validation, Seq, int>>(Seq(Error.New("alt"))); + var ma = Left, Validation, Seq, int>>(Seq1(Error.New("alt"))); var mb = ma.Traverse(identity); - var mc = Success, Seq, Either, int>>(Left(Seq(Error.New("alt")))); + var mc = Success, Seq, Either, int>>(Left(Seq1(Error.New("alt")))); Assert.Equal(mc, mb); } @@ -28,9 +28,9 @@ public void RightSuccessIsSuccess() [Fact] public void RightFailIsFail() { - var ma = Right, Validation, Seq, int>>(Fail, Seq, int>(Seq(Error.New("Error")))); + var ma = Right, Validation, Seq, int>>(Fail, Seq, int>(Seq1(Error.New("Error")))); var mb = ma.Traverse(identity); - var mc = Fail, Seq, Either, int>>(Seq(Error.New("Error"))); + var mc = Fail, Seq, Either, int>>(Seq1(Error.New("Error"))); Assert.Equal(mc, mb); } } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/EitherUnsafe.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/EitherUnsafe.cs index 0e64d0295..16d446811 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/EitherUnsafe.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/EitherUnsafe.cs @@ -10,9 +10,9 @@ public class EitherUnsafe [Fact] public void LeftIsSuccessLeft() { - var ma = LeftUnsafe, Validation, Seq, int>>(Seq(Error.New("alt"))); + var ma = LeftUnsafe, Validation, Seq, int>>(Seq1(Error.New("alt"))); var mb = ma.Traverse(identity); - var mc = Success, Seq, EitherUnsafe, int>>(LeftUnsafe(Seq(Error.New("alt")))); + var mc = Success, Seq, EitherUnsafe, int>>(LeftUnsafe(Seq1(Error.New("alt")))); Assert.Equal(mc, mb); } @@ -28,9 +28,9 @@ public void RightSuccessIsSuccess() [Fact] public void RightFailIsFail() { - var ma = RightUnsafe, Validation, Seq, int>>(Fail, Seq, int>(Seq(Error.New("Error")))); + var ma = RightUnsafe, Validation, Seq, int>>(Fail, Seq, int>(Seq1(Error.New("Error")))); var mb = ma.Traverse(identity); - var mc = Fail, Seq, EitherUnsafe, int>>(Seq(Error.New("Error"))); + var mc = Fail, Seq, EitherUnsafe, int>>(Seq1(Error.New("Error"))); Assert.Equal(mc, mb); } } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Identity.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Identity.cs index 1f9cb8477..8089a6cc8 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Identity.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Identity.cs @@ -20,9 +20,9 @@ public void IdentitySuccessIsSuccessIdentity() [Fact] public void IdentityFailIsFailIdentity() { - var ma = Id(Fail, Seq, int>(Seq(Error.New("error")))); + var ma = Id(Fail, Seq, int>(Seq1(Error.New("error")))); var mb = ma.Traverse(identity); - var mc = Fail, Seq, Identity>(Seq(Error.New("error"))); + var mc = Fail, Seq, Identity>(Seq1(Error.New("error"))); Assert.Equal(mc, mb); } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Option.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Option.cs index 0ca0b7473..6d07caf74 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Option.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/Option.cs @@ -30,9 +30,9 @@ public void SomeSuccessIsSuccessSome() [Fact] public void SomeFailIsFailSome() { - var ma = Some(Fail, Seq, int>(Seq(Error.New("Err")))); + var ma = Some(Fail, Seq, int>(Seq1(Error.New("Err")))); var mb = ma.Traverse(identity); - var mc = Fail, Seq, Option>(Seq(Error.New("Err"))); + var mc = Fail, Seq, Option>(Seq1(Error.New("Err"))); Assert.Equal(mc, mb); } diff --git a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/OptionUnsafe.cs b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/OptionUnsafe.cs index aed8d5e25..447d1e19a 100644 --- a/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/OptionUnsafe.cs +++ b/LanguageExt.Tests/Transformer/Traverse/ValidationMonoid/Sync/OptionUnsafe.cs @@ -30,9 +30,9 @@ public void SomeSuccessIsSuccessSome() [Fact] public void SomeFailIsFailSome() { - var ma = SomeUnsafe(Fail, Seq, int>(Seq(Error.New("Err")))); + var ma = SomeUnsafe(Fail, Seq, int>(Seq1(Error.New("Err")))); var mb = ma.Traverse(identity); - var mc = Fail, Seq, OptionUnsafe>(Seq(Error.New("Err"))); + var mc = Fail, Seq, OptionUnsafe>(Seq1(Error.New("Err"))); Assert.Equal(mc, mb); } diff --git a/LanguageExt.Tests/ValidationTests.cs b/LanguageExt.Tests/ValidationTests.cs index 2546a1126..210771ca0 100644 --- a/LanguageExt.Tests/ValidationTests.cs +++ b/LanguageExt.Tests/ValidationTests.cs @@ -77,7 +77,7 @@ public void ValidationSeq_BiMap_Success() [Fact] public void Validation_MapFails_Failure() { - var failure = Fail, Seq, int>(Seq("something went wrong")) + var failure = Fail, Seq, int>(Seq1("something went wrong")) .MapFail, Seq>(f => f.Map(ToUpper)); failure.Match( @@ -103,7 +103,7 @@ public void Validation_MapFails_Success() [Fact] public void Validation_BiMap_Failure() { - var failure = Fail, Seq, int>(Seq("something went wrong")) + var failure = Fail, Seq, int>(Seq1("something went wrong")) .BiMap, Seq, int>( Success: succ => succ + 1, Fail: fail => fail.Map(ToUpper)