Skip to content

Commit 15a6c01

Browse files
authored
Merge pull request #70513 from kavon/delet-underscore-copyable
[NCGenerics] delete `_Copyable` from stdlib
2 parents f68e0c9 + b43f861 commit 15a6c01

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

lib/Sema/TypeCheckProtocol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4717,7 +4717,7 @@ swift::checkTypeWitness(Type type, AssociatedTypeDecl *assocType,
47174717
// No move-only type can witness an associatedtype requirement.
47184718
// Pretend the failure is a lack of Copyable conformance.
47194719
auto *copyable = ctx.getProtocol(KnownProtocolKind::Copyable);
4720-
assert(copyable && "missing _Copyable protocol!");
4720+
assert(copyable && "missing Copyable protocol!");
47214721
return CheckTypeWitnessResult::forConformance(copyable);
47224722
}
47234723

stdlib/public/core/Misc.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,6 @@ public func _unsafePerformance<T>(_ c: () -> T) -> T {
160160
}
161161

162162
/// This marker protocol represents types that support copying.
163-
/// This type is not yet available for use to express explicit
164-
/// constraints on generics in your programs. It is currently
165-
/// only used internally by the compiler.
166-
@available(*, unavailable)
167-
@_marker public protocol _Copyable {} // FIXME: rdar://115793371 (delete _Copyable from stdlib)
168-
169-
170163
@_marker public protocol Copyable {}
171164

172165
@_marker public protocol Escapable {}

0 commit comments

Comments
 (0)