Use some .NET 9 features.

MrKWatkins · Nov 17, 2024 · dee9843 · dee9843
1 parent 8dedba6
commit dee9843
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/src/MrKWatkins.Ast/Node.Messages.cs b/src/MrKWatkins.Ast/Node.Messages.cs
@@ -5,7 +5,7 @@ namespace MrKWatkins.Ast;
 public abstract partial class Node<TNode>
     where TNode : Node<TNode>
 {
-    private readonly object messagesLock = new();
+    private readonly Lock messagesLock = new();
     private ImmutableList<Message> messages = ImmutableList<Message>.Empty;
 
     /// <summary>

diff --git a/src/MrKWatkins.Ast/Node.cs b/src/MrKWatkins.Ast/Node.cs
@@ -22,7 +22,7 @@ protected Node()
     /// </summary>
     /// <param name="children">The children to add.</param>
     /// <exception cref="InvalidOperationException">If any of <see cref="Children" /> already have a <see cref="Parent" />.</exception>
-    protected Node([InstantHandle] IEnumerable<TNode> children)
+    protected Node([InstantHandle] params IEnumerable<TNode> children)
     {
         Children = new Children<TNode>(This, children);
     }

diff --git a/src/MrKWatkins.Ast/Position/BinaryFile.cs b/src/MrKWatkins.Ast/Position/BinaryFile.cs
@@ -61,7 +61,7 @@ public BinaryFilePosition CreatePosition(int startIndex, int length) =>
     public BinaryFilePosition CreateEntireFilePosition() => new(this, 0, Length);
 
     [Pure]
-    private static IReadOnlyList<byte> ReadStream(Stream stream)
+    private static byte[] ReadStream(Stream stream)
     {
         using var memoryStream = new MemoryStream();
         stream.CopyTo(memoryStream);

diff --git a/src/MrKWatkins.Ast/Processing/PipelineBuilder.cs b/src/MrKWatkins.Ast/Processing/PipelineBuilder.cs
@@ -50,7 +50,7 @@ public PipelineBuilder<TNode> AddStage<TProcessor>(string name)
     /// <param name="processor">The first processor to add.</param>
     /// <param name="others">Other processors to add.</param>
     /// <returns>The fluent builder.</returns>
-    public PipelineBuilder<TNode> AddStage(Processor<TNode> processor, params Processor<TNode>[] others) =>
+    public PipelineBuilder<TNode> AddStage(Processor<TNode> processor, [InstantHandle] params IEnumerable<Processor<TNode>> others) =>
         AddStage(b => b.Add(processor, others));
 
     /// <summary>
@@ -60,7 +60,7 @@ public PipelineBuilder<TNode> AddStage(Processor<TNode> processor, params Proces
     /// <param name="processor">The first processor to add.</param>
     /// <param name="others">Other processors to add.</param>
     /// <returns>The fluent builder.</returns>
-    public PipelineBuilder<TNode> AddStage(string name, Processor<TNode> processor, params Processor<TNode>[] others) =>
+    public PipelineBuilder<TNode> AddStage(string name, Processor<TNode> processor, [InstantHandle] params IEnumerable<Processor<TNode>> others) =>
         AddStage(b => b.WithName(name).Add(processor, others));
 
     /// <summary>
@@ -85,7 +85,7 @@ public PipelineBuilder<TNode> AddParallelStage(Action<ParallelPipelineStageBuild
     /// <param name="processor2">The second processor to add.</param>
     /// <param name="others">Other processors to add.</param>
     /// <returns>The fluent builder.</returns>
-    public PipelineBuilder<TNode> AddParallelStage(UnorderedProcessor<TNode> processor1, UnorderedProcessor<TNode> processor2, params UnorderedProcessor<TNode>[] others) =>
+    public PipelineBuilder<TNode> AddParallelStage(UnorderedProcessor<TNode> processor1, UnorderedProcessor<TNode> processor2, [InstantHandle] params IEnumerable<UnorderedProcessor<TNode>> others) =>
         AddParallelStage(b => b.Add(processor1).Add(processor2, others));
 
     /// <summary>
@@ -97,7 +97,7 @@ public PipelineBuilder<TNode> AddParallelStage(UnorderedProcessor<TNode> process
     /// <param name="processor2">The second processor to add.</param>
     /// <param name="others">Other processors to add.</param>
     /// <returns>The fluent builder.</returns>
-    public PipelineBuilder<TNode> AddParallelStage(string name, UnorderedProcessor<TNode> processor1, UnorderedProcessor<TNode> processor2, params UnorderedProcessor<TNode>[] others) =>
+    public PipelineBuilder<TNode> AddParallelStage(string name, UnorderedProcessor<TNode> processor1, UnorderedProcessor<TNode> processor2, [InstantHandle] params IEnumerable<UnorderedProcessor<TNode>> others) =>
         AddParallelStage(b => b.WithName(name).Add(processor1).Add(processor2, others));
 
     /// <summary>
@@ -112,7 +112,7 @@ public PipelineBuilder<TNode> AddParallelStage(string name, UnorderedProcessor<T
     /// <param name="processor2">The second processor to add.</param>
     /// <param name="others">Other processors to add.</param>
     /// <returns>The fluent builder.</returns>
-    public PipelineBuilder<TNode> AddParallelStage(int maxDegreeOfParallelism, UnorderedProcessor<TNode> processor1, UnorderedProcessor<TNode> processor2, params UnorderedProcessor<TNode>[] others) =>
+    public PipelineBuilder<TNode> AddParallelStage(int maxDegreeOfParallelism, UnorderedProcessor<TNode> processor1, UnorderedProcessor<TNode> processor2, [InstantHandle] params IEnumerable<UnorderedProcessor<TNode>> others) =>
         AddParallelStage(b => b.Add(processor1).Add(processor2, others).WithMaxDegreeOfParallelism(maxDegreeOfParallelism));
 
     /// <summary>
@@ -128,7 +128,6 @@ public PipelineBuilder<TNode> AddParallelStage(int maxDegreeOfParallelism, Unord
     /// <param name="processor2">The second processor to add.</param>
     /// <param name="others">Other processors to add.</param>
     /// <returns>The fluent builder.</returns>
-    public PipelineBuilder<TNode> AddParallelStage(string name, int maxDegreeOfParallelism, UnorderedProcessor<TNode> processor1, UnorderedProcessor<TNode> processor2,
-        params UnorderedProcessor<TNode>[] others) =>
+    public PipelineBuilder<TNode> AddParallelStage(string name, int maxDegreeOfParallelism, UnorderedProcessor<TNode> processor1, UnorderedProcessor<TNode> processor2, [InstantHandle] params IEnumerable<UnorderedProcessor<TNode>> others) =>
         AddParallelStage(b => b.WithName(name).Add(processor1).Add(processor2, others).WithMaxDegreeOfParallelism(maxDegreeOfParallelism));
 }
diff --git a/src/MrKWatkins.Ast/Processing/PipelineStageBuilder.cs b/src/MrKWatkins.Ast/Processing/PipelineStageBuilder.cs
@@ -42,7 +42,7 @@ public TSelf Add<TConstructableProcessor>()
     /// <param name="processor">The first processor to add.</param>
     /// <param name="others">Other processors to add.</param>
     /// <returns>The fluent builder.</returns>
-    public TSelf Add(TProcessor processor, params TProcessor[] others)
+    public TSelf Add(TProcessor processor, [InstantHandle] params IEnumerable<TProcessor> others)
     {
         Processors.Add(processor);
         Processors.AddRange(others);

diff --git a/src/MrKWatkins.Ast/PropertyNode.cs b/src/MrKWatkins.Ast/PropertyNode.cs
@@ -21,7 +21,7 @@ protected PropertyNode()
     /// </summary>
     /// <param name="children">The children to add.</param>
     /// <exception cref="InvalidOperationException">If any of <see cref="Node{TNode}.Children" /> already have a <see cref="Node{TNode}.Parent" />.</exception>
-    protected PropertyNode([InstantHandle] IEnumerable<TNode> children)
+    protected PropertyNode([InstantHandle] params IEnumerable<TNode> children)
         : base(children)
     {
     }