diff --git a/src/InlineIL.Fody/Extensions/FrameworkExtensions.cs b/src/InlineIL.Fody/Extensions/FrameworkExtensions.cs index d99afc8..fb9f9cd 100644 --- a/src/InlineIL.Fody/Extensions/FrameworkExtensions.cs +++ b/src/InlineIL.Fody/Extensions/FrameworkExtensions.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; namespace InlineIL.Fody.Extensions; @@ -30,15 +29,12 @@ public static TValue GetOrAddNew(this IDictionary di return value; } - public static void AddRange(this ICollection collection, IEnumerable items) + public static void AddRange(this ICollection collection, params IEnumerable items) { foreach (var item in items) collection.Add(item); } - public static void AddRange(this ICollection collection, params T[] items) - => AddRange(collection, items.AsEnumerable()); - public static int IndexOfFirst(this IEnumerable items, Func predicate) { var index = 0; diff --git a/src/InlineIL.Fody/Processing/WeaverILProcessor.cs b/src/InlineIL.Fody/Processing/WeaverILProcessor.cs index 4bbf81f..4ce54ba 100644 --- a/src/InlineIL.Fody/Processing/WeaverILProcessor.cs +++ b/src/InlineIL.Fody/Processing/WeaverILProcessor.cs @@ -37,7 +37,7 @@ public void Remove(Instruction instruction) UpdateReferences(instruction, newRef); } - public void Remove(params Instruction[] instructions) + public void Remove(params IEnumerable instructions) { foreach (var instruction in instructions) Remove(instruction); @@ -129,7 +129,7 @@ private void EnsureSameBasicBlock(Instruction instruction, int basicBlock) throw new InstructionWeavingException(instruction, "An unconditional expression was expected."); } - public bool TryMergeBasicBlocks(Instruction sourceBasicBlock, params Instruction[] basicBlocksToUpdate) + public bool TryMergeBasicBlocks(Instruction sourceBasicBlock, params IEnumerable basicBlocksToUpdate) { var sourceBlock = GetBasicBlock(sourceBasicBlock); var targetBlocks = basicBlocksToUpdate.Select(GetBasicBlock).ToHashSet(); diff --git a/src/InlineIL.Tests/Processing/MethodLocalsTests.cs b/src/InlineIL.Tests/Processing/MethodLocalsTests.cs index 322c232..7549c19 100644 --- a/src/InlineIL.Tests/Processing/MethodLocalsTests.cs +++ b/src/InlineIL.Tests/Processing/MethodLocalsTests.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using InlineIL.Fody.Model; using InlineIL.Fody.Processing; using InlineIL.Tests.Support; @@ -49,7 +50,7 @@ public void should_not_log_warning_for_used_named_locals() _logger.LoggedWarnings.ShouldBeEmpty(); } - private MethodLocals CreateLocals(params LocalVarBuilder[] localVarBuilders) + private MethodLocals CreateLocals(params IEnumerable localVarBuilders) { var methodLocals = new MethodLocals(new MethodDefinition("test", default, _module.TypeSystem.Void), _logger); methodLocals.DeclareLocals(localVarBuilders, null);