Skip to content

Commit 78b635a

Browse files
kavonkavon
authored
Merge pull request #73514 from kavon/6.0-ncgeneric-not-experimental
2 parents f42d619 + 45b42be commit 78b635a

File tree

138 files changed

+85
-215
lines changed

Some content is hidden

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

138 files changed

+85
-215
lines changed

‎include/swift/Basic/Features.def

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ LANGUAGE_FEATURE(MoveOnlyPartialConsumption, 429, "Partial consumption of noncop
179179
LANGUAGE_FEATURE(BitwiseCopyable, 426, "BitwiseCopyable protocol")
180180
SUPPRESSIBLE_LANGUAGE_FEATURE(ConformanceSuppression, 426, "Suppressible inferred conformances")
181181
SUPPRESSIBLE_LANGUAGE_FEATURE(BitwiseCopyable2, 426, "BitwiseCopyable feature")
182+
SUPPRESSIBLE_LANGUAGE_FEATURE(NoncopyableGenerics, 427, "Noncopyable generics")
182183

183184
// Swift 6
184185
UPCOMING_FEATURE(ConciseMagicFile, 274, 6)
@@ -321,9 +322,6 @@ EXPERIMENTAL_FEATURE(RawLayout, true)
321322
/// Enables the "embedded" swift mode (no runtime).
322323
EXPERIMENTAL_FEATURE(Embedded, true)
323324

324-
/// Enables noncopyable generics
325-
SUPPRESSIBLE_EXPERIMENTAL_FEATURE(NoncopyableGenerics, true)
326-
327325
// Alias for NoncopyableGenerics
328326
EXPERIMENTAL_FEATURE(NoncopyableGenerics2, true)
329327

‎test/Concurrency/transfernonsendable_instruction_matching.sil

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %target-sil-opt -transfer-non-sendable -enable-upcoming-feature RegionBasedIsolation -strict-concurrency=complete %s -verify -o /dev/null
2-
// RUN: %target-sil-opt -enable-experimental-feature NoncopyableGenerics -transfer-non-sendable -enable-upcoming-feature RegionBasedIsolation -strict-concurrency=complete %s -verify -o /dev/null
32

43
// REQUIRES: concurrency
54
// REQUIRES: asserts
@@ -1797,4 +1796,4 @@ bb0:
17971796

17981797
%9999 = tuple ()
17991798
return %9999 : $()
1800-
}
1799+
}

‎test/Generics/copyable_and_self_conforming_protocols.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -enable-experimental-feature NoncopyableGenerics -enable-experimental-feature NonescapableTypes %s -verify
1+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -enable-experimental-feature NonescapableTypes %s -verify
22

33
// REQUIRES: objc_interop
44
// REQUIRES: asserts

‎test/Generics/inverse_associatedtype_restriction.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %target-typecheck-verify-swift \
2-
// RUN: -enable-experimental-feature NoncopyableGenerics \
32
// RUN: -enable-experimental-feature NonescapableTypes
43

54
// The restriction is that we don't permit suppression requirements on

‎test/Generics/inverse_classes1.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// RUN: %target-typecheck-verify-swift \
22
// RUN: -parse-stdlib -module-name Swift \
3-
// RUN: -enable-experimental-feature MoveOnlyClasses \
4-
// RUN: -enable-experimental-feature NoncopyableGenerics
3+
// RUN: -enable-experimental-feature MoveOnlyClasses
54

65
// NOTE: -parse-stdlib is a transitional workaround and should not be required.
76

‎test/Generics/inverse_classes2.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// RUN: %target-typecheck-verify-swift \
2-
// RUN: -parse-stdlib -module-name Swift \
3-
// RUN: -enable-experimental-feature NoncopyableGenerics
2+
// RUN: -parse-stdlib -module-name Swift
43

54
// NOTE: -parse-stdlib is a transitional workaround and should not be required.
65

‎test/Generics/inverse_conditional_conformance_restriction.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %target-typecheck-verify-swift \
2-
// RUN: -enable-experimental-feature NoncopyableGenerics \
32
// RUN: -enable-experimental-feature NonescapableTypes \
43
// RUN: -enable-experimental-feature SuppressedAssociatedTypes
54

‎test/Generics/inverse_copyable_requirement.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %target-typecheck-verify-swift
2-
// RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics
32

43
// a concrete move-only type
54
struct MO: ~Copyable {

‎test/Generics/inverse_copyable_requirement_errors.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-typecheck-verify-swift -enable-experimental-feature NoncopyableGenerics
1+
// RUN: %target-typecheck-verify-swift
22

33
// a concrete move-only type
44
struct MO: ~Copyable {

‎test/Generics/inverse_extension_signatures.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %target-swift-frontend \
2-
// RUN: -enable-experimental-feature NoncopyableGenerics \
32
// RUN: -enable-experimental-feature NonescapableTypes \
43
// RUN: -verify -typecheck %s -debug-generic-signatures \
54
// RUN: -debug-inverse-requirements 2>&1 | %FileCheck %s --implicit-check-not "error:"

0 commit comments

Comments
 (0)