Merge pull request #37 from pfpack/release/v4.0.1-rc.1

release/v4.0.1-rc.1

Author: andreise

src/core-unit/Unit.Tests/Unit.Tests.csproj

@@ -36,7 +36,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit.v3" Version="3.2.0" />
+    <PackageReference Include="xunit.v3" Version="3.2.1" />
   </ItemGroup>
 
   <ItemGroup>

src/core-unit/Unit/Unit.csproj

@@ -19,7 +19,7 @@
     <Description>PrimeFuncPack Core.Unit is a core library for .NET consisting of Unit type targeted for use in functional programming.</Description>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>PrimeFuncPack.Core.Unit</AssemblyName>
-    <Version>4.0.0</Version>
+    <Version>4.0.1-rc.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/core-unit/Unit/UnitExtensions/ToUnit.cs

@@ -1,16 +1,17 @@
-namespace System;
+#pragma warning disable IDE0060 // Remove unused parameter
+
+using System.Runtime.CompilerServices;
+
+namespace System;
 
 partial class UnitExtensions
 {
     // We maintain that Unit can be derived from any input value.
-    // Unit.From is being called instead of returning default(Unit) for the sake of clarity.
     //
-    // Don't apply AggressiveInlining to this extension since it's already applied to Unit.From
-    // and redundant use of this attribute can reduce performance.
+    // This extension is for more convenient syntax when getting Unit from a result value.
     //
-    // This extension is for more convenient syntax when converting to Unit from a result value.
+    // (For better performance, default(Unit) is returned instead of calling symmetric Unit.From factory.)
 
-    public static Unit ToUnit<TResult>(this TResult result)
-        =>
-        Unit.From(result);
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Unit ToUnit<TResult>(this TResult result) => default;
 }

src/core-unit/Unit/UnitFormatting/UnitFormUtf8.Inner.Transform.cs

@@ -0,0 +1,44 @@
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+namespace System;
+
+partial class UnitFormUtf8
+{
+    private static Encoding Encoding => Encoding.UTF8;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static byte[]? InnerGetBytes(string s)
+    {
+        var bytesCount = Encoding.GetByteCount(s);
+        if (bytesCount == default)
+        {
+            return null;
+        }
+
+        var bytes = new byte[bytesCount];
+
+        var sourceSpan = s.AsSpan();
+        var destSpan = new Span<byte>(bytes);
+        var bytesWritten = Encoding.GetBytes(sourceSpan, destSpan);
+        Debug.Assert(bytesWritten == bytesCount);
+
+        return bytes;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static ReadOnlySpan<byte> InnerAsSpan(byte[]? bytes)
+    {
+        Debug.Assert(bytes is null || bytes.Length != default);
+
+        if (bytes is null)
+        {
+#pragma warning disable IDE0301 // Simplify collection initialization
+            return ReadOnlySpan<byte>.Empty;
+#pragma warning restore IDE0301 // Simplify collection initialization
+        }
+
+        return new(bytes);
+    }
+}

src/core-unit/Unit/UnitFormatting/UnitFormUtf8.Inner.Values.cs

@@ -0,0 +1,41 @@
+namespace System;
+
+partial class UnitFormUtf8
+{
+    // We initialize the byte arrays inline in separate classes without static ctors
+    // to obtain the values lazily and at the same time independently of each other.
+
+    // General (default) form
+    private static class InnerGeneral
+    {
+        internal static readonly byte[]? Value = InnerGetBytes(UnitForm.General);
+    }
+
+    // Basic forms
+    private static class InnerCanonical
+    {
+        internal static readonly byte[]? Value = InnerGetBytes(UnitForm.Canonical);
+    }
+    private static class InnerJsonObj
+    {
+        internal static readonly byte[]? Value = InnerGetBytes(UnitForm.JsonObj);
+    }
+    private static class InnerEmpty
+    {
+        internal static readonly byte[]? Value = InnerGetBytes(UnitForm.Empty);
+    }
+
+    // Extended forms
+    private static class InnerCanonicalExtended
+    {
+        internal static readonly byte[]? Value = InnerGetBytes(UnitForm.CanonicalExtended);
+    }
+    private static class InnerJsonObjExtended
+    {
+        internal static readonly byte[]? Value = InnerGetBytes(UnitForm.JsonObjExtended);
+    }
+    private static class InnerEmptyExtended
+    {
+        internal static readonly byte[]? Value = InnerGetBytes(UnitForm.EmptyExtended);
+    }
+}

src/core-unit/Unit/UnitFormatting/UnitFormUtf8.Values.cs

@@ -0,0 +1,17 @@
+namespace System;
+
+partial class UnitFormUtf8
+{
+    // General (default) form
+    internal static ReadOnlySpan<byte> General => InnerAsSpan(InnerGeneral.Value);
+
+    // Basic forms
+    internal static ReadOnlySpan<byte> Canonical => InnerAsSpan(InnerCanonical.Value);
+    internal static ReadOnlySpan<byte> JsonObj => InnerAsSpan(InnerJsonObj.Value);
+    internal static ReadOnlySpan<byte> Empty => InnerAsSpan(InnerEmpty.Value);
+
+    // Extended forms
+    internal static ReadOnlySpan<byte> CanonicalExtended => InnerAsSpan(InnerCanonicalExtended.Value);
+    internal static ReadOnlySpan<byte> JsonObjExtended => InnerAsSpan(InnerJsonObjExtended.Value);
+    internal static ReadOnlySpan<byte> EmptyExtended => InnerAsSpan(InnerEmptyExtended.Value);
+}

src/core-unit/Unit/UnitFormatting/UnitFormUtf8.cs

@@ -1,39 +1,5 @@
-using System.Text;
+namespace System;
 
-namespace System;
-
-internal static class UnitFormUtf8
+internal static partial class UnitFormUtf8
 {
-    // General (default) form
-    internal static ReadOnlySpan<byte> General => new(InnerBytes.General);
-
-    // Basic forms
-    internal static ReadOnlySpan<byte> Canonical => new(InnerBytes.Canonical);
-    internal static ReadOnlySpan<byte> JsonObj => new(InnerBytes.JsonObj);
-    internal static ReadOnlySpan<byte> Empty => new(InnerBytes.Empty);
-
-    // Extended forms
-    internal static ReadOnlySpan<byte> CanonicalExtended => new(InnerBytes.CanonicalExtended);
-    internal static ReadOnlySpan<byte> JsonObjExtended => new(InnerBytes.JsonObjExtended);
-    internal static ReadOnlySpan<byte> EmptyExtended => new(InnerBytes.EmptyExtended);
-
-    // We initialize the byte arrays inline with no static ctor to obtain and cache them
-    // lazily only on demand, and also isolate them in a nested class for thread-safety.
-    private static class InnerBytes
-    {
-        internal static readonly byte[] General = InnerGetBytes(UnitForm.General);
-
-        internal static readonly byte[] Canonical = InnerGetBytes(UnitForm.Canonical);
-        internal static readonly byte[] JsonObj = InnerGetBytes(UnitForm.JsonObj);
-        internal static readonly byte[] Empty = InnerGetBytes(UnitForm.Empty);
-
-        internal static readonly byte[] CanonicalExtended = InnerGetBytes(UnitForm.CanonicalExtended);
-        internal static readonly byte[] JsonObjExtended = InnerGetBytes(UnitForm.JsonObjExtended);
-        internal static readonly byte[] EmptyExtended = InnerGetBytes(UnitForm.EmptyExtended);
-
-        // We use the most proven method to obtain UTF-8 bytes.
-        private static byte[] InnerGetBytes(string s)
-            =>
-            Encoding.UTF8.GetBytes(s);
-    }
 }