Skip to content

Commit f08097e

Browse files
committed
[Constraint solver] Don't count suppressed diagnostics against the score.
1 parent 63985a7 commit f08097e

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

lib/Sema/CSFix.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ Optional<ScoreKind> ConstraintFix::affectsSolutionScore() const {
4646
return SK_Fix;
4747

4848
case FixBehavior::DowngradeToWarning:
49-
case FixBehavior::Suppress:
5049
return SK_DisfavoredOverload;
50+
51+
case FixBehavior::Suppress:
52+
return None;
5153
}
5254
}
5355

test/Concurrency/preconcurrency_overload.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,22 @@ extension Future {
99
func flatMap<NewValue>(_ callback: @escaping @Sendable (T) -> Future<NewValue>) -> Future<NewValue> { // #1
1010
fatalError()
1111
}
12+
13+
@preconcurrency
14+
public func flatMapErrorThrowing(_ callback: @escaping @Sendable (Error) throws -> T) -> Future<T> {
15+
fatalError("")
16+
}
1217
}
1318

1419
extension Future {
1520
@available(*, deprecated, message: "")
1621
func flatMap<NewValue>(file: StaticString = #file, line: UInt = #line, _ callback: @escaping (T) -> Future<NewValue>) -> Future<NewValue> { // #2
1722
return self.flatMap(callback)
1823
}
24+
25+
@inlinable
26+
@available(*, deprecated, message: "Please don't pass file:line:, there's no point.")
27+
public func flatMapErrorThrowing(file: StaticString = #file, line: UInt = #line, _ callback: @escaping (Error) throws -> T) -> Future<T> {
28+
return self.flatMapErrorThrowing(callback)
29+
}
1930
}

0 commit comments

Comments
 (0)