Skip to content

Simplify array helpers #79177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 27, 2025
Merged

Simplify array helpers #79177

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dada4b4
Simplify array helpers
CyrusNajmabadi Jun 27, 2025
b125c66
Merge remote-tracking branch 'upstream/main' into arraySimplification
CyrusNajmabadi Jun 27, 2025
9bea8e0
Simplify
CyrusNajmabadi Jun 27, 2025
7da4383
Cleanup
CyrusNajmabadi Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 27 additions & 66 deletions src/Dependencies/Collections/Extensions/ImmutableArrayExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Threading;
Expand Down Expand Up @@ -1048,133 +1049,93 @@ public static ImmutableArray<T> Concat<T>(this ImmutableArray<T> first, Immutabl
/// </summary>
public static ImmutableArray<T> Concat<T>(this ImmutableArray<T> first, ImmutableArray<T> second, ImmutableArray<T> third)
{
var builder = new T[first.Length + second.Length + third.Length];
var index = 0;
var builder = new FixedSizeArrayBuilder<T>(first.Length + second.Length + third.Length);

foreach (var item in first)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in second)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in third)
{
builder[index++] = item;
}
builder.Add(item);

return ImmutableCollectionsMarshal.AsImmutableArray(builder);
return builder.MoveToImmutable();
}

/// <summary>
/// Variant of <see cref="System.Linq.Enumerable.Concat{TSource}(IEnumerable{TSource}, IEnumerable{TSource})"/>.
/// </summary>
public static ImmutableArray<T> Concat<T>(this ImmutableArray<T> first, ImmutableArray<T> second, ImmutableArray<T> third, ImmutableArray<T> fourth)
{
var builder = new T[first.Length + second.Length + third.Length + fourth.Length];
var index = 0;
var builder = new FixedSizeArrayBuilder<T>(first.Length + second.Length + third.Length + fourth.Length);

foreach (var item in first)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in second)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in third)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in fourth)
{
builder[index++] = item;
}
builder.Add(item);

return ImmutableCollectionsMarshal.AsImmutableArray(builder);
return builder.MoveToImmutable();
}

/// <summary>
/// Variant of <see cref="System.Linq.Enumerable.Concat{TSource}(IEnumerable{TSource}, IEnumerable{TSource})"/>.
/// </summary>
public static ImmutableArray<T> Concat<T>(this ImmutableArray<T> first, ImmutableArray<T> second, ImmutableArray<T> third, ImmutableArray<T> fourth, ImmutableArray<T> fifth)
{
var builder = new T[first.Length + second.Length + third.Length + fourth.Length + fifth.Length];
var index = 0;
var builder = new FixedSizeArrayBuilder<T>(first.Length + second.Length + third.Length + fourth.Length + fifth.Length);

foreach (var item in first)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in second)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in third)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in fourth)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in fifth)
{
builder[index++] = item;
}
builder.Add(item);

return ImmutableCollectionsMarshal.AsImmutableArray(builder);
return builder.MoveToImmutable();
}

/// <summary>
/// Variant of <see cref="System.Linq.Enumerable.Concat{TSource}(IEnumerable{TSource}, IEnumerable{TSource})"/>.
/// </summary>
public static ImmutableArray<T> Concat<T>(this ImmutableArray<T> first, ImmutableArray<T> second, ImmutableArray<T> third, ImmutableArray<T> fourth, ImmutableArray<T> fifth, ImmutableArray<T> sixth)
{
var builder = new T[first.Length + second.Length + third.Length + fourth.Length + fifth.Length + sixth.Length];
var index = 0;
var builder = new FixedSizeArrayBuilder<T>(first.Length + second.Length + third.Length + fourth.Length + fifth.Length + sixth.Length);

foreach (var item in first)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in second)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in third)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in fourth)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in fifth)
{
builder[index++] = item;
}
builder.Add(item);

foreach (var item in sixth)
{
builder[index++] = item;
}
builder.Add(item);

return ImmutableCollectionsMarshal.AsImmutableArray(builder);
return builder.MoveToImmutable();
}

#endregion
Expand Down
Loading