mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
Move interleave(...) to the llvm namespace
This simplifies fixing the master-next build. Upstream LLVM already has a copy of this function, so on master-next we only need to delete the Swift copy, reducing the potential for merge conflicts.
This commit is contained in:
@@ -453,10 +453,12 @@ public:
|
||||
out << "@available(*, unavailable)\nextension ";
|
||||
nominal->getDeclaredType().print(out, printOptions);
|
||||
out << " : ";
|
||||
swift::interleave(ConditionalConformanceProtocols,
|
||||
[&out, &printOptions](const ProtocolType *protoTy) {
|
||||
protoTy->print(out, printOptions);
|
||||
}, [&out] { out << ", "; });
|
||||
llvm::interleave(
|
||||
ConditionalConformanceProtocols,
|
||||
[&out, &printOptions](const ProtocolType *protoTy) {
|
||||
protoTy->print(out, printOptions);
|
||||
},
|
||||
[&out] { out << ", "; });
|
||||
out << " where "
|
||||
<< nominal->getGenericSignature()->getGenericParams().front()->getName()
|
||||
<< " : " << DummyProtocolName << " {}\n";
|
||||
|
||||
Reference in New Issue
Block a user