averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename ErrorType to ErrorProtocol

Browse Source
This commit is contained in:
Dmitri Gribenko
2015-11-03 18:58:39 -08:00
committed by Max Moiseev
parent 99d3f96c6d
commit feacbc4433
123 changed files with 1121 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/Decl.cpp
View File

@@ -1889,8 +1889,8 @@ bool NominalTypeDecl::derivesProtocolConformance(ProtocolDecl *protocol) const {
if (!knownProtocol)
return false;
// All nominal types can derive their ErrorType conformance.
if (*knownProtocol == KnownProtocolKind::ErrorType)
// All nominal types can derive their ErrorProtocol conformance.
if (*knownProtocol == KnownProtocolKind::ErrorProtocol)
return true;
if (auto *enumDecl = dyn_cast<EnumDecl>(this)) {