Skip to content

Commit 7cca722

Browse files
committed
[Concurrency] NFC: Rename ImpliedByStandardProtocol to ImpliedByPreconcurrencyProtocol
The new name better reflects the intention for this Sendable check kind.
1 parent e24196e commit 7cca722

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
@@ -797,7 +797,7 @@ bool SendableCheckContext::warnInMinimalChecking() const {
797797
case SendableCheck::Explicit:
798798
return true;
799799

800-
case SendableCheck::ImpliedByStandardProtocol:
800+
case SendableCheck::ImpliedByPreconcurrencyProtocol:
801801
case SendableCheck::Implicit:
802802
case SendableCheck::ImplicitForExternallyVisible:
803803
return false;

lib/Sema/TypeCheckConcurrency.h

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

354354
/// Sendable conformance was implied by a protocol that inherits from
355355
/// Sendable and also predates concurrency.
356-
ImpliedByStandardProtocol,
356+
ImpliedByPreconcurrencyProtocol,
357357

358358
/// Implicit conformance to Sendable.
359359
Implicit,
@@ -367,7 +367,7 @@ enum class SendableCheck {
367367
static inline bool isImplicitSendableCheck(SendableCheck check) {
368368
switch (check) {
369369
case SendableCheck::Explicit:
370-
case SendableCheck::ImpliedByStandardProtocol:
370+
case SendableCheck::ImpliedByPreconcurrencyProtocol:
371371
return false;
372372

373373
case SendableCheck::Implicit:

lib/Sema/TypeCheckProtocol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6688,7 +6688,7 @@ void TypeChecker::checkConformancesInContext(IterableDeclContext *idc) {
66886688
if (!hasDeprecatedUnsafeSendable && SendableConformance) {
66896689
SendableCheck check = SendableCheck::Explicit;
66906690
if (sendableConformancePreconcurrency)
6691-
check = SendableCheck::ImpliedByStandardProtocol;
6691+
check = SendableCheck::ImpliedByPreconcurrencyProtocol;
66926692
else if (SendableConformance->getSourceKind() ==
66936693
ConformanceEntryKind::Synthesized)
66946694
check = SendableCheck::Implicit;

0 commit comments

Comments
 (0)