Skip to content

Commit dc55613

Browse files
committed
Fix
1 parent a2ed3f5 commit dc55613

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/Compilers/CSharp/Test/Semantic/SourceGeneration/GeneratorDriverTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,7 +1500,7 @@ [Attr] class C { }
15001500
{
15011501
var name = ctx.ForAttributeWithSimpleName<ClassDeclarationSyntax>("Attr")
15021502
.Select((c, _) => c.Identifier.ValueText)
1503-
.WithComparer(new LambdaComparer<string>((_, _) => throw e));
1503+
.WithComparer(EqualityComparer<string>.Create((_, _) => throw e));
15041504
ctx.RegisterSourceOutput(name, (spc, n) => spc.AddSource(n, "// generated"));
15051505
});
15061506

@@ -1997,7 +1997,7 @@ class C { }
19971997

19981998
var generator = new IncrementalGeneratorWrapper(new PipelineCallbackGenerator(ctx =>
19991999
{
2000-
var compilationSource = ctx.CompilationProvider.WithComparer(new LambdaComparer<Compilation>((c1, c2) => true, 0));
2000+
var compilationSource = ctx.CompilationProvider.WithComparer(EqualityComparer<Compilation>.Create((_, _) => true, _ => 0));
20012001
ctx.RegisterSourceOutput(compilationSource, (spc, c) =>
20022002
{
20032003
compilationsCalledFor.Add(c);
@@ -2035,7 +2035,7 @@ class C { }
20352035
{
20362036
var compilationSource = ctx.CompilationProvider.Combine(ctx.AdditionalTextsProvider.Collect())
20372037
// comparer that ignores the LHS (additional texts)
2038-
.WithComparer(new LambdaComparer<(Compilation, ImmutableArray<AdditionalText>)>((c1, c2) => c1.Item1 == c2.Item1, 0))
2038+
.WithComparer(EqualityComparer<(Compilation, ImmutableArray<AdditionalText>)>.Create((c1, c2) => c1.Item1 == c2.Item1, _ => 0))
20392039
.WithTrackingName("Step")
20402040
.Select((x, ct) => x)
20412041
.WithTrackingName("Step2");

src/Compilers/CSharp/Test/Semantic/SourceGeneration/StateTableTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void Node_Table_Caches_Previous_Object_When_Modification_Considered_Cache
233233
var expected = ImmutableArray.Create((1, EntryState.Added, 0), (2, EntryState.Added, 0), (3, EntryState.Added, 0));
234234
AssertTableEntries(previousTable, expected);
235235

236-
builder = previousTable.ToBuilder(stepName: null, false, new LambdaComparer<int>((i, j) => i == 3 || i == j));
236+
builder = previousTable.ToBuilder(stepName: null, false, EqualityComparer<int>.Create((i, j) => i == 3 || i == j));
237237
Assert.True(builder.TryModifyEntry(1, TimeSpan.Zero, default, EntryState.Modified)); // ((1, EntryState.Cached))
238238
Assert.True(builder.TryModifyEntry(4, TimeSpan.Zero, default, EntryState.Modified)); // ((4, EntryState.Modified))
239239
Assert.True(builder.TryModifyEntry(5, TimeSpan.Zero, default, EntryState.Modified)); // ((3, EntryState.Cached))
@@ -918,7 +918,7 @@ public void CombineNode_Records_Removed_Outputs_Of_Removed_First_Input()
918918
public void User_Comparer_Is_Not_Used_To_Determine_Inputs()
919919
{
920920
var inputNode = new InputNode<int>((_) => ImmutableArray.Create(1, 2, 3))
921-
.WithComparer(new LambdaComparer<int>((a, b) => false));
921+
.WithComparer(EqualityComparer<int>.Create((_, _) => false));
922922

923923
// first time through will always be added (because it's not been run before)
924924
DriverStateTable.Builder dstBuilder = GetBuilder(DriverStateTable.Empty);

src/Compilers/CSharp/Test/Semantic/SourceGeneration/SyntaxAwareGeneratorTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ class C
15131513
var testGenerator = new PipelineCallbackGenerator(context =>
15141514
{
15151515
var source = context.SyntaxProvider.CreateSyntaxProvider((c, _) => c is FieldDeclarationSyntax fds, (c, _) => ((FieldDeclarationSyntax)c.Node).Declaration.Variables[0].Identifier.ValueText);
1516-
source = source.WithComparer(new LambdaComparer<string>((a, b) => true)).WithTrackingName("Fields");
1516+
source = source.WithComparer(EqualityComparer<string>.Create((a, b) => true)).WithTrackingName("Fields");
15171517
context.RegisterSourceOutput(source, (spc, fieldName) =>
15181518
{
15191519
});
@@ -1574,10 +1574,10 @@ class C
15741574
syntaxCalledFor.Add(((FieldDeclarationSyntax)c.Node).Declaration.Variables[0].Identifier.ValueText);
15751575
return ((FieldDeclarationSyntax)c.Node).Declaration.Variables[0].Identifier.ValueText;
15761576
});
1577-
source = source.WithComparer(new LambdaComparer<string>((a, b) => false));
1578-
source = source.WithComparer(new LambdaComparer<string>((a, b) => false));
1579-
source = source.WithComparer(new LambdaComparer<string>((a, b) => false));
1580-
source = source.WithComparer(new LambdaComparer<string>((a, b) => false));
1577+
source = source.WithComparer(EqualityComparer<string>.Create((a, b) => false));
1578+
source = source.WithComparer(EqualityComparer<string>.Create((a, b) => false));
1579+
source = source.WithComparer(EqualityComparer<string>.Create((a, b) => false));
1580+
source = source.WithComparer(EqualityComparer<string>.Create((a, b) => false));
15811581
context.RegisterSourceOutput(source, (spc, fieldName) => { });
15821582
});
15831583

@@ -1631,7 +1631,7 @@ class C
16311631
noCompareCalledFor.Add(fieldName);
16321632
});
16331633

1634-
var comparerSource = source.WithComparer(new LambdaComparer<string>((a, b) => true));
1634+
var comparerSource = source.WithComparer(EqualityComparer<string>.Create((a, b) => true));
16351635
context.RegisterSourceOutput(comparerSource, (spc, fieldName) =>
16361636
{
16371637
compareCalledFor.Add(fieldName);
@@ -1794,7 +1794,7 @@ class C
17941794
return ((FieldDeclarationSyntax)c.Node).Declaration.Variables[0].Identifier.ValueText;
17951795
}).WithTrackingName("Fields");
17961796

1797-
var comparerSource = source.WithComparer(new LambdaComparer<string>((a, b) => false));
1797+
var comparerSource = source.WithComparer(EqualityComparer<string>.Create((a, b) => false));
17981798

17991799
// now join the two sources together
18001800
var joinedSource = source.Combine(comparerSource.Collect());

src/Compilers/Core/CodeAnalysisTest/Text/TextChangeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ private static void AssertChangedTextLinesHelper(string originalText, params Tex
280280
var changedText = SourceText.From(originalText).WithChanges(changes);
281281
var comparer = EqualityComparer<TextLine>.Create((x, y) => x.Span == y.Span, x => x.Span.GetHashCode());
282282

283-
Assert.Equal(SourceText.From(changedText.ToString()).Lines, changedText.Lines, new TextLineEqualityComparer());
283+
Assert.Equal(SourceText.From(changedText.ToString()).Lines, changedText.Lines, comparer);
284284
}
285285

286286
[Fact]

0 commit comments

Comments
 (0)