reduce unneeded internal use of IEnumerable<T>

Author: Pathoschild

src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ArgumentParser.cs

@@ -111,7 +111,7 @@ public bool TryGetInt(int index, string name, out int value, bool required = tru
     /// <returns>An enumerator that can be used to iterate through the collection.</returns>
     public IEnumerator<string> GetEnumerator()
     {
-        return ((IEnumerable<string>)this.Values).GetEnumerator();
+        return ((IReadOnlyList<string>)this.Values).GetEnumerator();
     }
 
     /// <summary>Returns an enumerator that iterates through a collection.</summary>

src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs

@@ -73,7 +73,7 @@ protected void LogArgumentNotInt(IMonitor monitor)
     /// <param name="data">The data to display.</param>
     /// <param name="header">The table header.</param>
     /// <param name="getRow">Returns a set of fields for a data value.</param>
-    protected string GetTableString<T>(IEnumerable<T> data, string[] header, Func<T, string[]> getRow)
+    protected string GetTableString<T>(T[] data, string[] header, Func<T, string[]> getRow)
     {
         // get table data
         int[] widths = header.Select(p => p.Length).ToArray();

src/SMAPI.Tests/Utilities/KeybindListTests.cs

@@ -121,10 +121,9 @@ public SButtonState GetState(string input, string stateMap)
     ** Private methods
     *********/
     /// <summary>Get all defined buttons.</summary>
-    private static IEnumerable<SButton> GetAllButtons()
+    private static SButton[] GetAllButtons()
     {
-        foreach (SButton button in Enum.GetValues<SButton>())
-            yield return button;
+        return Enum.GetValues<SButton>();
     }
 
     /// <summary>Get the button state defined by a mapping string.</summary>

src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs

@@ -109,13 +109,17 @@ public IEnumerable<ModDataField> GetFields()
     }
 
     /// <summary>Get the former mod IDs.</summary>
-    public IEnumerable<string> GetFormerIds()
+    public string[] GetFormerIds()
     {
-        if (this.FormerIds != null)
-        {
-            foreach (string id in this.FormerIds.Split('|'))
-                yield return id.Trim();
-        }
+#if NET6_0_OR_GREATER
+        return
+            this.FormerIds?.Split('|', StringSplitOptions.TrimEntries)
+            ?? [];
+#else
+        return this.FormerIds != null
+            ? this.FormerIds.Split('|').Select(id => id.Trim()).ToArray()
+            : [];
+#endif
     }
 
 

src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs

@@ -39,7 +39,7 @@ internal ModDataRecord(string displayName, ModDataModel model)
     {
         this.DisplayName = displayName;
         this.ID = model.Id;
-        this.FormerIDs = model.GetFormerIds().ToArray();
+        this.FormerIDs = model.GetFormerIds();
         this.SuppressWarnings = model.SuppressWarnings;
         this.IgnoreDependencies = model.IgnoreDependencies;
         this.Fields = model.GetFields().ToArray();

src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs

@@ -34,7 +34,7 @@ public ModDatabase(ModDataRecord[] records, Func<string, string?> getUpdateUrl)
     }
 
     /// <summary>Get all mod data records.</summary>
-    public IEnumerable<ModDataRecord> GetAll()
+    public IReadOnlyList<ModDataRecord> GetAll()
     {
         return this.Records;
     }

src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs

@@ -90,7 +90,7 @@ public ModFolder(string displayName, string directoryPath, ModType type, Manifes
 
     /// <summary>Get the update keys for a mod.</summary>
     /// <param name="manifest">The mod manifest.</param>
-    public IEnumerable<string> GetUpdateKeys(Manifest manifest)
+    public IReadOnlyList<string> GetUpdateKeys(Manifest manifest)
     {
         return
             manifest.UpdateKeys

src/SMAPI/Events/BuildingListChangedEventArgs.cs

@@ -32,7 +32,7 @@ public class BuildingListChangedEventArgs : EventArgs
     /// <param name="location">The location which changed.</param>
     /// <param name="added">The buildings added to the location.</param>
     /// <param name="removed">The buildings removed from the location.</param>
-    internal BuildingListChangedEventArgs(GameLocation location, IEnumerable<Building> added, IEnumerable<Building> removed)
+    internal BuildingListChangedEventArgs(GameLocation location, IReadOnlyList<Building> added, IReadOnlyList<Building> removed)
     {
         this.Location = location;
         this.Added = added.ToArray();

src/SMAPI/Events/DebrisListChangedEventArgs.cs

@@ -31,7 +31,7 @@ public class DebrisListChangedEventArgs : EventArgs
     /// <param name="location">The location which changed.</param>
     /// <param name="added">The debris added to the location.</param>
     /// <param name="removed">The debris removed from the location.</param>
-    internal DebrisListChangedEventArgs(GameLocation location, IEnumerable<Debris> added, IEnumerable<Debris> removed)
+    internal DebrisListChangedEventArgs(GameLocation location, IReadOnlyList<Debris> added, IReadOnlyList<Debris> removed)
     {
         this.Location = location;
         this.Added = added.ToArray();

src/SMAPI/Events/FurnitureListChangedEventArgs.cs

@@ -32,7 +32,7 @@ public class FurnitureListChangedEventArgs : EventArgs
     /// <param name="location">The location which changed.</param>
     /// <param name="added">The furniture added to the location.</param>
     /// <param name="removed">The furniture removed from the location.</param>
-    internal FurnitureListChangedEventArgs(GameLocation location, IEnumerable<Furniture> added, IEnumerable<Furniture> removed)
+    internal FurnitureListChangedEventArgs(GameLocation location, IReadOnlyList<Furniture> added, IReadOnlyList<Furniture> removed)
     {
         this.Location = location;
         this.Added = added.ToArray();