Merge pull request #1 from GrahamTheCoder/decrease-allocations

Decrease allocations

Author: pavlosmcg

Html2Text.PerfTests/Html2Text.PerfTests.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

Html2Text.RegressionTests/Html2Text.RegressionTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net10.0</TargetFrameworks>
     <LangVersion>12.0</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

Html2Text.Tests/DataTableDetectorTests.cs

@@ -1,4 +1,5 @@
-using Html2Text.Parsing;
+using System;
+using Html2Text.Parsing;
 using NUnit.Framework;
 using System.Collections.Generic;
 using Html2Text.Rendering.Tables;
@@ -12,7 +13,7 @@ public class DataTableDetectorTests
     public void IsDataTable_Returns_False_For_TextNode()
     {
         // arrange
-        var node = new Node { Text = "some text" };
+        var node = new Node { Chars = "some text".AsMemory() };
 
         // act
         var result = DataTableDetector.IsDataTable(node);
@@ -25,7 +26,7 @@ public void IsDataTable_Returns_False_For_TextNode()
     public void IsDataTable_Returns_False_For_NonTableNode()
     {
         // arrange
-        var node = new Node { TagName = "div" };
+        var node = new Node { TagChars = "div".AsMemory() };
 
         // act
         var result = DataTableDetector.IsDataTable(node);
@@ -38,7 +39,7 @@ public void IsDataTable_Returns_False_For_NonTableNode()
     public void IsDataTable_Returns_False_For_TableWithNoChildNodes()
     {
         // arrange
-        var node = new Node { TagName = "table" };
+        var node = new Node { TagChars = "table".AsMemory() };
 
         // act
         var result = DataTableDetector.IsDataTable(node);

Html2Text.Tests/Html2Text.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net8.0;net10.0</TargetFrameworks>
     <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
 

Html2Text.Tests/LexerTests.cs

@@ -29,7 +29,7 @@ private static List<Chunk> CollectTestOutput(string input)
     {
         var results = new List<Chunk>();
 
-        foreach (Token token in new Lexer(input.AsSpan()))
+        foreach (Token token in new Lexer(input.AsMemory()))
         {
             var content = token.TagName.IsEmpty
                 ? input.Substring(token.StartIndex, token.Length)
@@ -54,7 +54,7 @@ private static IEnumerable<string> DisplayTestOutput(List<Chunk> result)
     public void MoveNext_Returns_False_WhenInput_IsEmpty()
     {
         // arrange
-        var unit = new Lexer(ReadOnlySpan<char>.Empty);
+        var unit = new Lexer(ReadOnlyMemory<char>.Empty);
 
         // act
         var result = unit.MoveNext();
@@ -68,7 +68,7 @@ public void MoveNext_Returns_True_WithCurrentTextContent_WhenInput_IsSingleChara
     {
         // arrange
         var input = "z";
-        var unit = new Lexer(input.AsSpan());
+        var unit = new Lexer(input.AsMemory());
 
         // act
         var result = unit.MoveNext();
@@ -86,7 +86,7 @@ public void MoveNext_Returns_False_WhenInput_HasBeenConsumed()
     {
         // arrange
         var input = "hello";
-        var unit = new Lexer(input.AsSpan());
+        var unit = new Lexer(input.AsMemory());
 
         // act first read
         var result = unit.MoveNext();
@@ -110,7 +110,7 @@ public void MoveNext_Returns_True_WithTextToken_WhenInput_IsOnlyText()
     {
         // arrange
         var input = "blorgfester";
-        var unit = new Lexer(input.AsSpan());
+        var unit = new Lexer(input.AsMemory());
 
         // act
         var result = unit.MoveNext();
@@ -130,7 +130,7 @@ public void MoveNext_Returns_True_WithCurrentOpeningTagToken_WhenInput_IsOpening
     {
         // arrange
         var input = "<p>";
-        var unit = new Lexer(input.AsSpan());
+        var unit = new Lexer(input.AsMemory());
 
         // act
         var result = unit.MoveNext();
@@ -148,7 +148,7 @@ public void MoveNext_Returns_True_WithCurrentClosingTag_WhenInput_IsClosingTag()
         // arrange
         var input = "</p>";
 
-        var unit = new Lexer(input.AsSpan());
+        var unit = new Lexer(input.AsMemory());
 
         // act
         var result = unit.MoveNext();
@@ -513,7 +513,7 @@ public void GetEnumerator_Returns_TextTokens_WhenInput_IsMalformedSelfClosingTag
     public void MoveNext_Returns_False_WhenInput_ContainsOnlyScriptElement()
     {
         // arrange
-        var unit = new Lexer("<script>var a = 1 / 2; b = 3 < c >= 4;</script>".AsSpan());
+        var unit = new Lexer("<script>var a = 1 / 2; b = 3 < c >= 4;</script>".AsMemory());
 
         // act
         var result = unit.MoveNext();