Skip to content

Commit 4adffcd

Browse files
xedinxedin
committed
[Feature] Switch migration postfix from :adoption to :migrate
(cherry picked from commit 1ba077d)
1 parent 1cee7de commit 4adffcd

File tree

7 files changed

+74
-74
lines changed

7 files changed

+74
-74
lines changed

‎lib/Frontend/CompilerInvocation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ static bool ParseEnabledFeatureArgs(LangOptions &Opts, ArgList &Args,
816816
continue;
817817
}
818818

819-
// For all other features, the argument format is `<name>[:adoption]`.
819+
// For all other features, the argument format is `<name>[:migrate]`.
820820
StringRef featureName;
821821
std::optional<StringRef> featureMode;
822822
std::tie(featureName, featureMode) = argValue.rsplit(':');
@@ -875,7 +875,7 @@ static bool ParseEnabledFeatureArgs(LangOptions &Opts, ArgList &Args,
875875
const auto isMigratable = feature->isMigratable();
876876

877877
// Diagnose an invalid mode.
878-
StringRef validModeName = "adoption";
878+
StringRef validModeName = "migrate";
879879
if (*featureMode != validModeName) {
880880
Diags.diagnose(SourceLoc(), diag::invalid_feature_mode, *featureMode,
881881
featureName,

‎test/Concurrency/attr_execution/adoption_mode.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %target-typecheck-verify-swift -target %target-swift-5.1-abi-triple -swift-version 5 -enable-upcoming-feature NonisolatedNonsendingByDefault:adoption
2-
// RUN: %target-typecheck-verify-swift -target %target-swift-5.1-abi-triple -swift-version 6 -enable-upcoming-feature NonisolatedNonsendingByDefault:adoption
1+
// RUN: %target-typecheck-verify-swift -target %target-swift-5.1-abi-triple -swift-version 5 -enable-upcoming-feature NonisolatedNonsendingByDefault:migrate
2+
// RUN: %target-typecheck-verify-swift -target %target-swift-5.1-abi-triple -swift-version 6 -enable-upcoming-feature NonisolatedNonsendingByDefault:migrate
33

44
// REQUIRES: swift_feature_NonisolatedNonsendingByDefault
55

‎test/Frontend/features/adoption_mode.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,48 @@
44
// RUN: %target-swift-frontend -parse -swift-version 5 \
55
// RUN: -enable-upcoming-feature DynamicActorIsolation:invalid1 \
66
// RUN: -enable-upcoming-feature DynamicActorIsolation:invalid2 \
7-
// RUN: -enable-upcoming-feature DynamicActorIsolation:adoption \
8-
// RUN: -enable-upcoming-feature DynamicActorIsolation:adoption \
7+
// RUN: -enable-upcoming-feature DynamicActorIsolation:migrate \
8+
// RUN: -enable-upcoming-feature DynamicActorIsolation:migrate \
99
// RUN: -enable-experimental-feature DynamicActorIsolation:invalid3 \
1010
// RUN: -enable-experimental-feature DynamicActorIsolation:invalid4 \
11-
// RUN: -enable-experimental-feature DynamicActorIsolation:adoption \
12-
// RUN: -enable-experimental-feature DynamicActorIsolation:adoption \
11+
// RUN: -enable-experimental-feature DynamicActorIsolation:migrate \
12+
// RUN: -enable-experimental-feature DynamicActorIsolation:migrate \
1313
// RUN: -disable-upcoming-feature DynamicActorIsolation:invalid5 \
1414
// RUN: -disable-upcoming-feature DynamicActorIsolation:invalid6 \
15-
// RUN: -disable-upcoming-feature DynamicActorIsolation:adoption \
15+
// RUN: -disable-upcoming-feature DynamicActorIsolation:migrate \
1616
// RUN: -disable-experimental-feature DynamicActorIsolation:invalid7 \
1717
// RUN: -disable-experimental-feature DynamicActorIsolation:invalid8 \
18-
// RUN: -disable-experimental-feature DynamicActorIsolation:adoption \
18+
// RUN: -disable-experimental-feature DynamicActorIsolation:migrate \
1919
// RUN: %s 2>&1 | %FileCheck %s --check-prefix=CHECK-SWIFT-5
2020

2121
// RUN: %target-swift-frontend -parse -swift-version 6 \
2222
// RUN: -enable-upcoming-feature DynamicActorIsolation:invalid1 \
23-
// RUN: -enable-upcoming-feature DynamicActorIsolation:adoption \
23+
// RUN: -enable-upcoming-feature DynamicActorIsolation:migrate \
2424
// RUN: -enable-experimental-feature DynamicActorIsolation:invalid2 \
25-
// RUN: -enable-experimental-feature DynamicActorIsolation:adoption \
25+
// RUN: -enable-experimental-feature DynamicActorIsolation:migrate \
2626
// RUN: -disable-upcoming-feature DynamicActorIsolation:invalid3 \
27-
// RUN: -disable-upcoming-feature DynamicActorIsolation:adoption \
27+
// RUN: -disable-upcoming-feature DynamicActorIsolation:migrate \
2828
// RUN: -disable-experimental-feature DynamicActorIsolation:invalid4 \
29-
// RUN: -disable-experimental-feature DynamicActorIsolation:adoption \
29+
// RUN: -disable-experimental-feature DynamicActorIsolation:migrate \
3030
// RUN: %s 2>&1 | %FileCheck %s --check-prefix=CHECK-SWIFT-6
3131

3232
// REQUIRES: swift_feature_DynamicActorIsolation
3333

3434
// CHECK-NOT: error:
3535

3636
// CHECK-SWIFT-5-NOT: warning:
37-
// CHECK-SWIFT-5: warning: '-disable-experimental-feature' argument 'DynamicActorIsolation:adoption' cannot specify a mode [#StrictLanguageFeatures]{{$}}
37+
// CHECK-SWIFT-5: warning: '-disable-experimental-feature' argument 'DynamicActorIsolation:migrate' cannot specify a mode [#StrictLanguageFeatures]{{$}}
3838
// CHECK-SWIFT-5-NEXT: warning: '-disable-experimental-feature' argument 'DynamicActorIsolation:invalid8' cannot specify a mode [#StrictLanguageFeatures]{{$}}
3939
// CHECK-SWIFT-5-NEXT: warning: '-disable-experimental-feature' argument 'DynamicActorIsolation:invalid7' cannot specify a mode [#StrictLanguageFeatures]{{$}}
40-
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'DynamicActorIsolation:adoption' cannot specify a mode [#StrictLanguageFeatures]{{$}}
40+
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'DynamicActorIsolation:migrate' cannot specify a mode [#StrictLanguageFeatures]{{$}}
4141
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'DynamicActorIsolation:invalid6' cannot specify a mode [#StrictLanguageFeatures]{{$}}
4242
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'DynamicActorIsolation:invalid5' cannot specify a mode [#StrictLanguageFeatures]{{$}}
43-
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support adoption mode [#StrictLanguageFeatures]{{$}}
44-
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support adoption mode [#StrictLanguageFeatures]{{$}}
43+
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support migration mode [#StrictLanguageFeatures]{{$}}
44+
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support migration mode [#StrictLanguageFeatures]{{$}}
4545
// CHECK-SWIFT-5-NEXT: warning: 'invalid4' is not a recognized mode for feature 'DynamicActorIsolation' [#StrictLanguageFeatures]{{$}}
4646
// CHECK-SWIFT-5-NEXT: warning: 'invalid3' is not a recognized mode for feature 'DynamicActorIsolation' [#StrictLanguageFeatures]{{$}}
47-
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support adoption mode [#StrictLanguageFeatures]{{$}}
48-
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support adoption mode [#StrictLanguageFeatures]{{$}}
47+
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support migration mode [#StrictLanguageFeatures]{{$}}
48+
// CHECK-SWIFT-5-NEXT: warning: feature 'DynamicActorIsolation' does not support migration mode [#StrictLanguageFeatures]{{$}}
4949
// CHECK-SWIFT-5-NEXT: warning: 'invalid2' is not a recognized mode for feature 'DynamicActorIsolation' [#StrictLanguageFeatures]{{$}}
5050
// CHECK-SWIFT-5-NEXT: warning: 'invalid1' is not a recognized mode for feature 'DynamicActorIsolation' [#StrictLanguageFeatures]{{$}}
5151
// CHECK-SWIFT-5-NOT: warning:

‎test/Frontend/features/adoption_mode_adoptable_feature.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33

44
// RUN: %target-swift-frontend -parse -swift-version 6 \
55
// RUN: -enable-upcoming-feature ExistentialAny:invalid1 \
6-
// RUN: -enable-upcoming-feature ExistentialAny:adoption \
6+
// RUN: -enable-upcoming-feature ExistentialAny:migrate \
77
// RUN: -enable-experimental-feature ExistentialAny:invalid2 \
8-
// RUN: -enable-experimental-feature ExistentialAny:adoption \
9-
// RUN: -disable-upcoming-feature ExistentialAny:adoption \
10-
// RUN: -disable-experimental-feature ExistentialAny:adoption \
8+
// RUN: -enable-experimental-feature ExistentialAny:migrate \
9+
// RUN: -disable-upcoming-feature ExistentialAny:migrate \
10+
// RUN: -disable-experimental-feature ExistentialAny:migrate \
1111
// RUN: %s 2>&1 | %FileCheck %s --check-prefix=CHECK-SWIFT-5
1212

1313
// RUN: %target-swift-frontend -parse -swift-version 7 \
1414
// RUN: -enable-upcoming-feature ExistentialAny:invalid1 \
15-
// RUN: -enable-upcoming-feature ExistentialAny:adoption \
15+
// RUN: -enable-upcoming-feature ExistentialAny:migrate \
1616
// RUN: -enable-experimental-feature ExistentialAny:invalid2 \
17-
// RUN: -enable-experimental-feature ExistentialAny:adoption \
18-
// RUN: -disable-upcoming-feature ExistentialAny:adoption \
19-
// RUN: -disable-experimental-feature ExistentialAny:adoption \
17+
// RUN: -enable-experimental-feature ExistentialAny:migrate \
18+
// RUN: -disable-upcoming-feature ExistentialAny:migrate \
19+
// RUN: -disable-experimental-feature ExistentialAny:migrate \
2020
// RUN: %s 2>&1 | %FileCheck %s --check-prefix=CHECK-SWIFT-7
2121

2222
// REQUIRES: swift_feature_ExistentialAny
@@ -25,10 +25,10 @@
2525
// CHECK-NOT: error:
2626

2727
// CHECK-SWIFT-5-NOT: warning:
28-
// CHECK-SWIFT-5: warning: '-disable-experimental-feature' argument 'ExistentialAny:adoption' cannot specify a mode [#StrictLanguageFeatures]{{$}}
29-
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'ExistentialAny:adoption' cannot specify a mode [#StrictLanguageFeatures]{{$}}
30-
// CHECK-SWIFT-5-NEXT: warning: 'invalid2' is not a recognized mode for feature 'ExistentialAny'; did you mean 'adoption'? [#StrictLanguageFeatures]{{$}}
31-
// CHECK-SWIFT-5-NEXT: warning: 'invalid1' is not a recognized mode for feature 'ExistentialAny'; did you mean 'adoption'? [#StrictLanguageFeatures]{{$}}
28+
// CHECK-SWIFT-5: warning: '-disable-experimental-feature' argument 'ExistentialAny:migrate' cannot specify a mode [#StrictLanguageFeatures]{{$}}
29+
// CHECK-SWIFT-5-NEXT: warning: '-disable-upcoming-feature' argument 'ExistentialAny:migrate' cannot specify a mode [#StrictLanguageFeatures]{{$}}
30+
// CHECK-SWIFT-5-NEXT: warning: 'invalid2' is not a recognized mode for feature 'ExistentialAny'; did you mean 'migrate'? [#StrictLanguageFeatures]{{$}}
31+
// CHECK-SWIFT-5-NEXT: warning: 'invalid1' is not a recognized mode for feature 'ExistentialAny'; did you mean 'migrate'? [#StrictLanguageFeatures]{{$}}
3232
// CHECK-SWIFT-5-NOT: warning:
3333

3434
// CHECK-SWIFT-7-NOT: warning:

‎test/type/explicit_existential.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// RUN: -verify-additional-prefix default-swift-mode- \
99
// RUN: -verify-additional-prefix explicit-any-
1010

11-
// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ExistentialAny:adoption \
11+
// RUN: %target-typecheck-verify-swift -enable-upcoming-feature ExistentialAny:migrate \
1212
// To verify that the message is not followed by
1313
// "; this will be an error ...".
1414
// RUN: -verify-additional-prefix default-swift-mode- \

0 commit comments

Comments
 (0)