Skip to content

Commit 704c7e1

Browse files
authored
Merge pull request #41764 from ktoso/wip-flag-module
[Distributed] rename _Distributed to module
2 parents 80ef80f + 4796fb3 commit 704c7e1

File tree

86 files changed

+114
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+114
-114
lines changed

include/swift/AST/DiagnosticsSema.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4534,7 +4534,7 @@ ERROR(distributed_actor_isolated_non_self_reference,none,
45344534
"non-isolated context",
45354535
(DescriptiveDeclKind, DeclName))
45364536
ERROR(distributed_actor_needs_explicit_distributed_import,none,
4537-
"'_Distributed' module not imported, required for 'distributed actor'",
4537+
"'Distributed' module not imported, required for 'distributed actor'",
45384538
())
45394539
ERROR(actor_isolated_inout_state,none,
45404540
"actor-isolated %0 %1 cannot be passed 'inout' to"

include/swift/AST/KnownIdentifiers.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ IDENTIFIER(CoreFoundation)
6060
IDENTIFIER(count)
6161
IDENTIFIER(CVarArg)
6262
IDENTIFIER(Darwin)
63-
IDENTIFIER_(Distributed)
63+
IDENTIFIER(Distributed)
6464
IDENTIFIER(dealloc)
6565
IDENTIFIER(debugDescription)
6666
IDENTIFIER(Decodable)

include/swift/AST/TypeCheckRequests.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2738,7 +2738,7 @@ class HasCircularRawValueRequest
27382738
bool isCached() const { return true; }
27392739
};
27402740

2741-
/// Checks if the _Distributed module is available.
2741+
/// Checks if the Distributed module is available.
27422742
class DistributedModuleIsAvailableRequest
27432743
: public SimpleRequest<DistributedModuleIsAvailableRequest, bool(Decl *),
27442744
RequestFlags::Cached> {

include/swift/Option/FrontendOptions.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ def disable_implicit_concurrency_module_import : Flag<["-"],
408408

409409
def disable_implicit_distributed_module_import : Flag<["-"],
410410
"disable-implicit-distributed-module-import">,
411-
HelpText<"Disable the implicit import of the _Distributed module.">;
411+
HelpText<"Disable the implicit import of the Distributed module.">;
412412

413413
def disable_arc_opts : Flag<["-"], "disable-arc-opts">,
414414
HelpText<"Don't run SIL ARC optimization passes.">;

include/swift/Strings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ constexpr static const StringLiteral SWIFT_ONONE_SUPPORT = "SwiftOnoneSupport";
2525
/// The name of the Concurrency module, which supports that extension.
2626
constexpr static const StringLiteral SWIFT_CONCURRENCY_NAME = "_Concurrency";
2727
/// The name of the Distributed module, which supports that extension.
28-
constexpr static const StringLiteral SWIFT_DISTRIBUTED_NAME = "_Distributed";
28+
constexpr static const StringLiteral SWIFT_DISTRIBUTED_NAME = "Distributed";
2929
/// The name of the StringProcessing module, which supports that extension.
3030
constexpr static const StringLiteral SWIFT_STRING_PROCESSING_NAME = "_StringProcessing";
3131
/// The name of the SwiftShims module, which contains private stdlib decls.

lib/AST/Decl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5569,7 +5569,7 @@ void ProtocolDecl::computeKnownProtocolKind() const {
55695569
!module->getName().is("Foundation") &&
55705570
!module->getName().is("_Differentiation") &&
55715571
!module->getName().is("_Concurrency") &&
5572-
!module->getName().is("_Distributed")) {
5572+
!module->getName().is("Distributed")) {
55735573
const_cast<ProtocolDecl *>(this)->Bits.ProtocolDecl.KnownProtocol = 1;
55745574
return;
55755575
}

lib/SILGen/SILGenDistributed.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static void emitDistributedIfRemoteBranch(SILGenFunction &SGF, SILLocation Loc,
115115

116116
FuncDecl *isRemoteFn = ctx.getIsRemoteDistributedActor();
117117
assert(isRemoteFn && "Could not find 'is remote' function, is the "
118-
"'_Distributed' module available?");
118+
"'Distributed' module available?");
119119

120120
ManagedValue selfAnyObject = B.createInitExistentialRef(
121121
Loc, SGF.getLoweredType(ctx.getAnyObjectType()), CanType(selfTy),

lib/Sema/TypeCheckDistributed.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ DistributedModuleIsAvailableRequest::evaluate(Evaluator &evaluator,
4747
if (C.getLoadedModule(C.Id_Distributed))
4848
return true;
4949

50-
// seems we're missing the _Distributed module, ask to import it explicitly
50+
// seems we're missing the Distributed module, ask to import it explicitly
5151
decl->diagnose(diag::distributed_actor_needs_explicit_distributed_import);
5252
return false;
5353
}
@@ -639,7 +639,7 @@ void TypeChecker::checkDistributedActor(SourceFile *SF, NominalTypeDecl *nominal
639639
if (!nominal)
640640
return;
641641

642-
// ==== Ensure the _Distributed module is available,
642+
// ==== Ensure the Distributed module is available,
643643
// without it there's no reason to check the decl in more detail anyway.
644644
if (!swift::ensureDistributedModuleLoaded(nominal))
645645
return;

lib/Sema/TypeCheckDistributed.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class NominalTypeDecl;
3434
/********************* Distributed Actor Type Checking ************************/
3535
/******************************************************************************/
3636

37-
// Diagnose an error if the _Distributed module is not loaded.
37+
// Diagnose an error if the Distributed module is not loaded.
3838
bool ensureDistributedModuleLoaded(Decl *decl);
3939

4040
/// Check for illegal property declarations (e.g. re-declaring transport or id)

stdlib/cmake/modules/AddSwiftStdlib.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1750,7 +1750,7 @@ function(add_swift_target_library name)
17501750
# Turn off implicit import of _Concurrency when building libraries
17511751
list(APPEND SWIFTLIB_SWIFT_COMPILE_FLAGS "-Xfrontend;-disable-implicit-concurrency-module-import")
17521752

1753-
# Turn off implicit import of _Distributed when building libraries
1753+
# Turn off implicit import of Distributed when building libraries
17541754
if(SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED)
17551755
list(APPEND SWIFTLIB_SWIFT_COMPILE_FLAGS
17561756
"-Xfrontend;-disable-implicit-distributed-module-import")

0 commit comments

Comments
 (0)