Skip to content

Commit a947450

Browse files
committed
[Concurrency] NFC: Rename ImpliedByStandardProtocol to ImpliedByPreconcurrencyProtocol
The new name better reflects the intention for this Sendable check kind. (cherry picked from commit 7cca722)
1 parent 82f04e5 commit a947450

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/Sema/TypeCheckConcurrency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ bool SendableCheckContext::warnInMinimalChecking() const {
798798
case SendableCheck::Explicit:
799799
return true;
800800

801-
case SendableCheck::ImpliedByStandardProtocol:
801+
case SendableCheck::ImpliedByPreconcurrencyProtocol:
802802
case SendableCheck::Implicit:
803803
case SendableCheck::ImplicitForExternallyVisible:
804804
return false;

lib/Sema/TypeCheckConcurrency.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ enum class SendableCheck {
352352

353353
/// Sendable conformance was implied by a protocol that inherits from
354354
/// Sendable and also predates concurrency.
355-
ImpliedByStandardProtocol,
355+
ImpliedByPreconcurrencyProtocol,
356356

357357
/// Implicit conformance to Sendable.
358358
Implicit,
@@ -366,7 +366,7 @@ enum class SendableCheck {
366366
static inline bool isImplicitSendableCheck(SendableCheck check) {
367367
switch (check) {
368368
case SendableCheck::Explicit:
369-
case SendableCheck::ImpliedByStandardProtocol:
369+
case SendableCheck::ImpliedByPreconcurrencyProtocol:
370370
return false;
371371

372372
case SendableCheck::Implicit:

lib/Sema/TypeCheckProtocol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6681,7 +6681,7 @@ void TypeChecker::checkConformancesInContext(IterableDeclContext *idc) {
66816681
if (!hasDeprecatedUnsafeSendable && SendableConformance) {
66826682
SendableCheck check = SendableCheck::Explicit;
66836683
if (sendableConformancePreconcurrency)
6684-
check = SendableCheck::ImpliedByStandardProtocol;
6684+
check = SendableCheck::ImpliedByPreconcurrencyProtocol;
66856685
else if (SendableConformance->getSourceKind() ==
66866686
ConformanceEntryKind::Synthesized)
66876687
check = SendableCheck::Implicit;

0 commit comments

Comments
 (0)