diff --git a/src/flatcollections-array/FlatArray/FlatArray.T.Builder/Factory/FlatArray.Builder.Factory.Constructor.1_16.cs b/src/flatcollections-array/FlatArray/FlatArray.T.Builder/Factory/FlatArray.Builder.Factory.Constructor.1_16.cs index a51c174..08e891f 100644 --- a/src/flatcollections-array/FlatArray/FlatArray.T.Builder/Factory/FlatArray.Builder.Factory.Constructor.1_16.cs +++ b/src/flatcollections-array/FlatArray/FlatArray.T.Builder/Factory/FlatArray.Builder.Factory.Constructor.1_16.cs @@ -11,9 +11,7 @@ partial class Builder public Builder(T item0) { length = 1; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 1); Debug.Assert(items.Length == 1); @@ -25,13 +23,11 @@ public Builder( T item1) { length = 2; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, item1 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 2); Debug.Assert(items.Length == 2); @@ -44,14 +40,12 @@ public Builder( T item2) { length = 3; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, item1, item2 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 3); Debug.Assert(items.Length == 3); @@ -65,7 +59,6 @@ public Builder( T item3) { length = 4; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -73,7 +66,6 @@ public Builder( item2, item3 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 4); Debug.Assert(items.Length == 4); @@ -88,7 +80,6 @@ public Builder( T item4) { length = 5; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -97,7 +88,6 @@ public Builder( item3, item4 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 5); Debug.Assert(items.Length == 5); @@ -113,7 +103,6 @@ public Builder( T item5) { length = 6; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -123,7 +112,6 @@ public Builder( item4, item5 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 6); Debug.Assert(items.Length == 6); @@ -140,7 +128,6 @@ public Builder( T item6) { length = 7; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -151,7 +138,6 @@ public Builder( item5, item6 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 7); Debug.Assert(items.Length == 7); @@ -169,7 +155,6 @@ public Builder( T item7) { length = 8; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -181,7 +166,6 @@ public Builder( item6, item7 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 8); Debug.Assert(items.Length == 8); @@ -200,7 +184,6 @@ public Builder( T item8) { length = 9; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -213,7 +196,6 @@ public Builder( item7, item8 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 9); Debug.Assert(items.Length == 9); @@ -233,7 +215,6 @@ public Builder( T item9) { length = 10; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -247,7 +228,6 @@ public Builder( item8, item9 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 10); Debug.Assert(items.Length == 10); @@ -268,7 +248,6 @@ public Builder( T item10) { length = 11; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -283,7 +262,6 @@ public Builder( item9, item10 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 11); Debug.Assert(items.Length == 11); @@ -305,7 +283,6 @@ public Builder( T item11) { length = 12; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -321,7 +298,6 @@ public Builder( item10, item11 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 12); Debug.Assert(items.Length == 12); @@ -344,7 +320,6 @@ public Builder( T item12) { length = 13; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -361,7 +336,6 @@ public Builder( item11, item12 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 13); Debug.Assert(items.Length == 13); @@ -385,7 +359,6 @@ public Builder( T item13) { length = 14; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -403,7 +376,6 @@ public Builder( item12, item13 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 14); Debug.Assert(items.Length == 14); @@ -428,7 +400,6 @@ public Builder( T item14) { length = 15; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -447,7 +418,6 @@ public Builder( item13, item14 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 15); Debug.Assert(items.Length == 15); @@ -473,7 +443,6 @@ public Builder( T item15) { length = 16; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -493,7 +462,6 @@ public Builder( item14, item15 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 16); Debug.Assert(items.Length == 16); diff --git a/src/flatcollections-array/FlatArray/FlatArray.T.Builder/FlatArray.Builder.InnerAsSpan.cs b/src/flatcollections-array/FlatArray/FlatArray.T.Builder/FlatArray.Builder.InnerAsSpan.cs index 5dc237b..bfb376a 100644 --- a/src/flatcollections-array/FlatArray/FlatArray.T.Builder/FlatArray.Builder.InnerAsSpan.cs +++ b/src/flatcollections-array/FlatArray/FlatArray.T.Builder/FlatArray.Builder.InnerAsSpan.cs @@ -11,9 +11,7 @@ private Span InnerAsSpan() { if (length == default) { -#pragma warning disable IDE0301 // Simplify collection initialization return Span.Empty; -#pragma warning restore IDE0301 // Simplify collection initialization } if (length == items.Length) diff --git a/src/flatcollections-array/FlatArray/FlatArray.T/Factory/Factory.Constructor.1_16.cs b/src/flatcollections-array/FlatArray/FlatArray.T/Factory/Factory.Constructor.1_16.cs index b730be0..25cd138 100644 --- a/src/flatcollections-array/FlatArray/FlatArray.T/Factory/Factory.Constructor.1_16.cs +++ b/src/flatcollections-array/FlatArray/FlatArray.T/Factory/Factory.Constructor.1_16.cs @@ -10,9 +10,7 @@ partial struct FlatArray public FlatArray(T item) { length = 1; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 1); Debug.Assert(items.Length == 1); @@ -24,13 +22,11 @@ public FlatArray( T item1) { length = 2; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, item1 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 2); Debug.Assert(items.Length == 2); @@ -43,14 +39,12 @@ public FlatArray( T item2) { length = 3; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, item1, item2 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 3); Debug.Assert(items.Length == 3); @@ -64,7 +58,6 @@ public FlatArray( T item3) { length = 4; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -72,7 +65,6 @@ public FlatArray( item2, item3 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 4); Debug.Assert(items.Length == 4); @@ -87,7 +79,6 @@ public FlatArray( T item4) { length = 5; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -96,7 +87,6 @@ public FlatArray( item3, item4 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 5); Debug.Assert(items.Length == 5); @@ -112,7 +102,6 @@ public FlatArray( T item5) { length = 6; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -122,7 +111,6 @@ public FlatArray( item4, item5 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 6); Debug.Assert(items.Length == 6); @@ -139,7 +127,6 @@ public FlatArray( T item6) { length = 7; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -150,7 +137,6 @@ public FlatArray( item5, item6 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 7); Debug.Assert(items.Length == 7); @@ -168,7 +154,6 @@ public FlatArray( T item7) { length = 8; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -180,7 +165,6 @@ public FlatArray( item6, item7 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 8); Debug.Assert(items.Length == 8); @@ -199,7 +183,6 @@ public FlatArray( T item8) { length = 9; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -212,7 +195,6 @@ public FlatArray( item7, item8 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 9); Debug.Assert(items.Length == 9); @@ -232,7 +214,6 @@ public FlatArray( T item9) { length = 10; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -246,7 +227,6 @@ public FlatArray( item8, item9 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 10); Debug.Assert(items.Length == 10); @@ -267,7 +247,6 @@ public FlatArray( T item10) { length = 11; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -282,7 +261,6 @@ public FlatArray( item9, item10 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 11); Debug.Assert(items.Length == 11); @@ -304,7 +282,6 @@ public FlatArray( T item11) { length = 12; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -320,7 +297,6 @@ public FlatArray( item10, item11 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 12); Debug.Assert(items.Length == 12); @@ -343,7 +319,6 @@ public FlatArray( T item12) { length = 13; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -360,7 +335,6 @@ public FlatArray( item11, item12 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 13); Debug.Assert(items.Length == 13); @@ -384,7 +358,6 @@ public FlatArray( T item13) { length = 14; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -402,7 +375,6 @@ public FlatArray( item12, item13 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 14); Debug.Assert(items.Length == 14); @@ -427,7 +399,6 @@ public FlatArray( T item14) { length = 15; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -446,7 +417,6 @@ public FlatArray( item13, item14 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 15); Debug.Assert(items.Length == 15); @@ -472,7 +442,6 @@ public FlatArray( T item15) { length = 16; -#pragma warning disable IDE0300 // Simplify collection initialization items = new[] { item0, @@ -492,7 +461,6 @@ public FlatArray( item14, item15 }; -#pragma warning restore IDE0300 // Simplify collection initialization Debug.Assert(length == 16); Debug.Assert(items.Length == 16); diff --git a/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.AsSpanOrMemory.Explicit.cs b/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.AsSpanOrMemory.Explicit.cs index f61aaa0..af7e581 100644 --- a/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.AsSpanOrMemory.Explicit.cs +++ b/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.AsSpanOrMemory.Explicit.cs @@ -9,9 +9,7 @@ public ReadOnlySpan AsSpan() { if (length == default) { -#pragma warning disable IDE0301 // Simplify collection initialization return ReadOnlySpan.Empty; -#pragma warning restore IDE0301 // Simplify collection initialization } return length == items!.Length diff --git a/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.ToCollection.Explicit.cs b/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.ToCollection.Explicit.cs index 9bea589..ed23d15 100644 --- a/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.ToCollection.Explicit.cs +++ b/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.ToCollection.Explicit.cs @@ -6,18 +6,14 @@ namespace System; partial struct FlatArray { public T[] ToArray() -#pragma warning disable IDE0301 // Simplify collection initialization => length == default ? Array.Empty() : InnerArrayHelper.Copy(items!, length); -#pragma warning restore IDE0301 // Simplify collection initialization public List ToList() { if (length == default) { -#pragma warning disable IDE0028 // Simplify collection initialization return new(); -#pragma warning restore IDE0028 // Simplify collection initialization } ReadOnlySpan sourceSpan = length == items!.Length @@ -33,9 +29,7 @@ public ImmutableArray ToImmutableArray() { if (length == default) { -#pragma warning disable IDE0301 // Simplify collection initialization return ImmutableArray.Empty; -#pragma warning restore IDE0301 // Simplify collection initialization } ReadOnlySpan sourceSpan = length == items!.Length diff --git a/src/flatcollections-array/FlatArray/FlatArray.T/InnerEmptyArray/FlatArray.InnerEmptyArray.cs b/src/flatcollections-array/FlatArray/FlatArray.T/InnerEmptyArray/FlatArray.InnerEmptyArray.cs index c174fbd..95ace86 100644 --- a/src/flatcollections-array/FlatArray/FlatArray.T/InnerEmptyArray/FlatArray.InnerEmptyArray.cs +++ b/src/flatcollections-array/FlatArray/FlatArray.T/InnerEmptyArray/FlatArray.InnerEmptyArray.cs @@ -1,7 +1,4 @@ -#pragma warning disable IDE0300 // Simplify collection initialization -#pragma warning disable CA1825 // Avoid zero-length array allocations - -namespace System; +namespace System; partial struct FlatArray { @@ -14,7 +11,9 @@ private static class InnerEmptyArray private static class InnerInstance { +#pragma warning disable CA1825 // Avoid zero-length array allocations internal static readonly T[] Value = new T[default]; +#pragma warning restore CA1825 // Avoid zero-length array allocations } } } diff --git a/src/flatcollections-array/FlatArray/FlatArray.csproj b/src/flatcollections-array/FlatArray/FlatArray.csproj index 8c9ad15..cefb842 100644 --- a/src/flatcollections-array/FlatArray/FlatArray.csproj +++ b/src/flatcollections-array/FlatArray/FlatArray.csproj @@ -7,7 +7,7 @@ enable true true - $(NoWarn);IDE0130 + $(NoWarn);IDE0130;IDE0028;IDE0300;IDE0301 true LICENSE README.md @@ -19,7 +19,7 @@ PrimeFuncPack Core.FlatArray is a core library for .NET consisting of immutable FlatArray targeted for use in functional programming. System PrimeFuncPack.Core.FlatArray - 1.6.0-rc.1 + 1.6.0-rc.2 diff --git a/src/flatcollections/FlatCollections/FlatCollections.csproj b/src/flatcollections/FlatCollections/FlatCollections.csproj index 235bc8e..c95f3a1 100644 --- a/src/flatcollections/FlatCollections/FlatCollections.csproj +++ b/src/flatcollections/FlatCollections/FlatCollections.csproj @@ -19,7 +19,7 @@ PrimeFuncPack Core.FlatCollections is a set of immutable Flat collections for .NET designed for developing business applications based on functional programming. System PrimeFuncPack.Core.FlatCollections - 1.6.0-rc.1 + 1.6.0-rc.2