Skip to content

Commit b33c889

Browse files
committed
Fixes
1 parent c516c5e commit b33c889

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/Draco.Compiler.Tests/Semantics/TypeCheckingTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,7 @@ public void PassBaseTypeToDerivedTypeParameter()
19301930

19311931
// Assert
19321932
Assert.Single(diags);
1933-
AssertDiagnostics(diags, TypeCheckingErrors.NoMatchingOverload);
1933+
AssertDiagnostics(diags, TypeCheckingErrors.TypeMismatch);
19341934
}
19351935

19361936
[Fact]

src/Draco.Compiler/Internal/Solver/ConstraintSolver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private void CheckForIncompleteInference(DiagnosticBag diagnostics)
110110
location: InferDiagnosticTargetSyntax(this.Context.DeclaringSyntax)?.Location,
111111
formatArgs: this.ContextName));
112112

113-
this.FailRemainingRules();
113+
this.FailRemainingRules(diagnostics);
114114
}
115115

116116
/// <summary>

src/Draco.Compiler/Internal/Solver/ConstraintSolver_Rules.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,8 @@ private static void FailOverload(Overload overload)
454454
/// <summary>
455455
/// Fails all remaining rules in the solver.
456456
/// </summary>
457-
private void FailRemainingRules()
457+
/// <param name="diagnostics">Diagnostics to report to.</param>
458+
private void FailRemainingRules(DiagnosticBag diagnostics)
458459
{
459460
var previousStoreSize = this.constraintStore.Count;
460461
while (true)
@@ -478,7 +479,7 @@ private void FailRemainingRules()
478479
this.constraintStore.RemoveAll(constraintsToRemove);
479480

480481
// Assume this solves everything
481-
this.SolveUntilFixpoint(DiagnosticBag.Empty);
482+
this.SolveUntilFixpoint(diagnostics);
482483

483484
// Check for exit condition
484485
if (previousStoreSize == this.constraintStore.Count) break;

0 commit comments

Comments
 (0)