Skip to content

Commit e20afd2

Browse files
Remove redundant .ToArray()/.ToList() (#2944)
* Remove for Task.WhenAll * Remove for ConcurrentDictionary * Use collection expressions * Use for ConucrrentDictionary * Use for string.Join * Change signature for PageCoverage.ConvertToDisjointRanges * Fix for BrowserData/Chrome as it is not ConcurrentDictionary * Bump SixLabors.ImageSharp to 3.1.17
1 parent de7b94c commit e20afd2

File tree

12 files changed

+18
-26
lines changed

12 files changed

+18
-26
lines changed

lib/PuppeteerSharp.Tests/PuppeteerSharp.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PackageReference>
1919
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2020
<PackageReference Include="System.Net.Http" Version="4.3.4" />
21-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
21+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
2222
<PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" />
2323
</ItemGroup>
2424
<Import Project="../Common/CommonProps.props" />

lib/PuppeteerSharp/Binding.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ await context.EvaluateFunctionAsync(
136136
}
137137
finally
138138
{
139-
await Task.WhenAll(garbage.ToArray()).ConfigureAwait(false);
139+
await Task.WhenAll(garbage).ConfigureAwait(false);
140140
}
141141
}
142142
}

lib/PuppeteerSharp/BrowserData/Firefox.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private static void SyncPreferences(Dictionary<string, object> defaultPreference
123123
var userPath = Path.Combine(tempUserDataDirectory, "user.js");
124124
var lines = string.Join(
125125
"\n",
126-
defaultPreferences.Select(i => $"user_pref({JsonSerializer.Serialize(i.Key)}, {JsonSerializer.Serialize(i.Value)});").ToArray());
126+
defaultPreferences.Select(i => $"user_pref({JsonSerializer.Serialize(i.Key)}, {JsonSerializer.Serialize(i.Value)});"));
127127

128128
BackupFile(userPath);
129129
BackupFile(prefsPath);

lib/PuppeteerSharp/Cdp/CdpBrowser.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,7 @@ public override async Task<IBrowserContext> CreateBrowserContextAsync(BrowserCon
143143
}
144144

145145
/// <inheritdoc/>
146-
public override IBrowserContext[] BrowserContexts()
147-
{
148-
var contexts = _contexts.Values.ToArray<IBrowserContext>();
149-
150-
var allContexts = new IBrowserContext[contexts.Length + 1];
151-
allContexts[0] = DefaultContext;
152-
contexts.CopyTo(allContexts, 1);
153-
return allContexts;
154-
}
146+
public override IBrowserContext[] BrowserContexts() => [DefaultContext, .. _contexts.Values];
155147

156148
internal static async Task<CdpBrowser> CreateAsync(
157149
SupportedBrowser browserToCreate,

lib/PuppeteerSharp/Cdp/CdpCDPSession.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ internal override void Close(string closeReason)
149149
CloseReason = closeReason;
150150
IsClosed = true;
151151

152-
foreach (var callback in _callbacks.Values.ToArray())
152+
foreach (var callback in _callbacks.Values)
153153
{
154154
callback.TaskWrapper.TrySetException(new TargetClosedException(
155155
$"Protocol error({callback.Method}): Target closed.",

lib/PuppeteerSharp/Cdp/Connection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,14 @@ internal void Close(string closeReason)
208208
Transport.StopReading();
209209
Disconnected?.Invoke(this, EventArgs.Empty);
210210

211-
foreach (var session in _sessions.Values.ToArray())
211+
foreach (var session in _sessions.Values)
212212
{
213213
session.Close(closeReason);
214214
}
215215

216216
_sessions.Clear();
217217

218-
foreach (var response in _callbacks.Values.ToArray())
218+
foreach (var response in _callbacks.Values)
219219
{
220220
response.TaskWrapper.TrySetException(new TargetClosedException(
221221
$"Protocol error({response.Method}): Target closed.",

lib/PuppeteerSharp/Cdp/FrameManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ private void OnLifeCycleEvent(LifecycleEventResponse e)
283283

284284
private void OnExecutionContextsCleared(CDPSession session)
285285
{
286-
foreach (var key in _contextIdToContext.Keys.ToArray())
286+
foreach (var key in _contextIdToContext.Keys)
287287
{
288288
var context = _contextIdToContext[key];
289289
if (context.Client != session)

lib/PuppeteerSharp/PageCoverage/CSSCoverage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ await Task.WhenAll(
9393
var url = kv.Value.Url;
9494
var text = kv.Value.Source;
9595
styleSheetIdToCoverage.TryGetValue(styleSheetId, out var responseRanges);
96-
var ranges = Coverage.ConvertToDisjointRanges(responseRanges ?? new List<CoverageRange>());
96+
var ranges = Coverage.ConvertToDisjointRanges(responseRanges ?? []);
9797
coverage.Add(new CoverageEntry
9898
{
9999
Url = url,

lib/PuppeteerSharp/PageCoverage/Coverage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public Task StartCSSCoverageAsync(CoverageStartOptions options = null)
3030
/// <inheritdoc/>
3131
public Task<CoverageEntry[]> StopCSSCoverageAsync() => _cssCoverage.StopAsync();
3232

33-
internal static CoverageEntryRange[] ConvertToDisjointRanges(List<CoverageRange> nestedRanges)
33+
internal static CoverageEntryRange[] ConvertToDisjointRanges(IEnumerable<CoverageRange> nestedRanges)
3434
{
3535
var points = new List<CoverageEntryPoint>();
3636
foreach (var range in nestedRanges)

lib/PuppeteerSharp/PageCoverage/JSCoverage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ await Task.WhenAll(
9393
continue;
9494
}
9595

96-
var flattenRanges = entry.Functions.SelectMany(f => f.Ranges).ToList();
96+
var flattenRanges = entry.Functions.SelectMany(f => f.Ranges);
9797
var ranges = Coverage.ConvertToDisjointRanges(flattenRanges);
9898
coverage.Add(new JSCoverageEntry
9999
{

0 commit comments

Comments
 (0)