Skip to content

Commit 6e975da

Browse files
committed
[BitwiseCopyable] Promote ConformanceSuppression.
The ability to suppress conformance to BitwiseCopyable was part of the accepted SE-428.
1 parent ed5c7ef commit 6e975da

File tree

4 files changed

+1
-6
lines changed

4 files changed

+1
-6
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(BuiltinAddressOfRawLayout, 0, "Builtin.addressOfRawLayout")
179179
LANGUAGE_FEATURE(MoveOnlyPartialConsumption, 429, "Partial consumption of noncopyable values")
180180
/// Enable bitwise-copyable feature.
181181
LANGUAGE_FEATURE(BitwiseCopyable, 426, "BitwiseCopyable protocol")
182+
SUPPRESSIBLE_LANGUAGE_FEATURE(ConformanceSuppression, 426, "Suppressible inferred conformances")
182183

183184
// Swift 6
184185
UPCOMING_FEATURE(ConciseMagicFile, 274, 6)
@@ -345,9 +346,6 @@ EXPERIMENTAL_FEATURE(StaticExclusiveOnly, true)
345346
/// Enable the @extractConstantsFromMembers attribute.
346347
EXPERIMENTAL_FEATURE(ExtractConstantsFromMembers, false)
347348

348-
/// Enable the suppression of inferred, non-invertible, protocols via ~.
349-
SUPPRESSIBLE_EXPERIMENTAL_FEATURE(ConformanceSuppression, true)
350-
351349
/// Enables the FixedArray data type.
352350
EXPERIMENTAL_FEATURE(FixedArrays, true)
353351

stdlib/public/core/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "Macros")
316316
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "FreestandingMacros")
317317
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "Extern")
318318
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "BorrowingSwitch")
319-
list(APPEND swift_stdlib_compile_flags "-enable-experimental-feature" "ConformanceSuppression")
320319

321320
if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "")
322321
set(swift_bin_dir "${CMAKE_BINARY_DIR}/bin")

test/SILGen/bitwise_copyable.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// RUN: %s \
33
// RUN: -emit-silgen \
44
// RUN: -disable-availability-checking \
5-
// RUN: -enable-experimental-feature ConformanceSuppression \
65
// RUN: -enable-builtin-module
76

87
// REQUIRES: asserts

test/Sema/bitwise_copyable_2.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// RUN: %target-typecheck-verify-swift \
22
// RUN: -enable-experimental-feature NonescapableTypes \
3-
// RUN: -enable-experimental-feature ConformanceSuppression \
43
// RUN: -enable-builtin-module \
54
// RUN: -debug-diagnostic-names
65

0 commit comments

Comments
 (0)