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

Rename array upcast/bridge expressions to "collection".

Browse Source 
This is staging for dictionary bridging upcasts.


Swift SVN r18840
This commit is contained in:
Doug Gregor
2014-06-12 21:41:55 +00:00
parent 8a6ee4c8e7
commit 5ca3882b06
11 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Sema/CSSimplify.cpp
View File

@@ -3126,7 +3126,7 @@ ConstraintSystem::simplifyRestrictedConstraint(ConversionRestrictionKind restric
return SolutionKind::Error;
}
increaseScore(SK_ArrayUpcastConversion);
increaseScore(SK_CollectionUpcastConversion);
addContextualScore();
assert(matchKind >= TypeMatchKind::Conversion);
@@ -3161,7 +3161,7 @@ ConstraintSystem::simplifyRestrictedConstraint(ConversionRestrictionKind restric
return SolutionKind::Unsolved;
}
increaseScore(SK_ArrayBridgedConversion);
increaseScore(SK_CollectionBridgedConversion);
addContextualScore();
assert(matchKind >= TypeMatchKind::Conversion);