Skip to content

Commit b8b1e34

Browse files
authored
Merge pull request #67389 from DougGregor/se-0401-feature-rename
2 parents 9e73dad + f03ad11 commit b8b1e34

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

include/swift/Basic/Features.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ UPCOMING_FEATURE(ForwardTrailingClosures, 286, 6)
114114
UPCOMING_FEATURE(BareSlashRegexLiterals, 354, 6)
115115
UPCOMING_FEATURE(ExistentialAny, 335, 6)
116116
UPCOMING_FEATURE(ImportObjcForwardDeclarations, 384, 6)
117-
UPCOMING_FEATURE(DisableActorInferenceFromPropertyWrapperUsage, 401, 6)
117+
UPCOMING_FEATURE(DisableOutwardActorInference, 401, 6)
118118

119119
EXPERIMENTAL_FEATURE(StaticAssert, false)
120120
EXPERIMENTAL_FEATURE(NamedOpaqueTypes, false)

lib/AST/ASTPrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3387,7 +3387,7 @@ static bool usesFeatureBuiltinMacros(Decl *decl) {
33873387
}
33883388

33893389

3390-
static bool usesFeatureDisableActorInferenceFromPropertyWrapperUsage(Decl *decl) {
3390+
static bool usesFeatureDisableOutwardActorInference(Decl *decl) {
33913391
return false;
33923392
}
33933393

lib/Sema/TypeCheckConcurrency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3701,7 +3701,7 @@ getIsolationFromWrappers(NominalTypeDecl *nominal) {
37013701
return llvm::None;
37023702

37033703
ASTContext &ctx = nominal->getASTContext();
3704-
if (ctx.LangOpts.hasFeature(Feature::DisableActorInferenceFromPropertyWrapperUsage)) {
3704+
if (ctx.LangOpts.hasFeature(Feature::DisableOutwardActorInference)) {
37053705
// In Swift 6, we no longer infer isolation of a nominal type
37063706
// based on the property wrappers used in its stored properties
37073707
return llvm::None;

0 commit comments

Comments
 (0)