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

Use dictionary type sugar in the standard library.

Browse Source 
Swift SVN r19264
This commit is contained in:
Doug Gregor
2014-06-26 22:26:58 +00:00
parent 232bc5861a
commit bea1d3d9b3
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stdlib/core/Dictionary.swift
View File

@@ -1772,8 +1772,8 @@ struct Dictionary<KeyType : Hashable, ValueType> : Collection,
}
@public func == <KeyType : Equatable, ValueType : Equatable>(
lhs: Dictionary<KeyType, ValueType>,
rhs: Dictionary<KeyType, ValueType>
lhs: [KeyType : ValueType],
rhs: [KeyType : ValueType]
) -> Bool {
switch (lhs._variantStorage, rhs._variantStorage) {
case (.Native(let lhsNativeOwner), .Native(let rhsNativeOwner)):
@@ -1838,8 +1838,8 @@ struct Dictionary<KeyType : Hashable, ValueType> : Collection,
}
@public func != <KeyType : Equatable, ValueType : Equatable>(
lhs: Dictionary<KeyType, ValueType>,
rhs: Dictionary<KeyType, ValueType>
lhs: [KeyType : ValueType],
rhs: [KeyType : ValueType]
) -> Bool {
return !(lhs == rhs)
}

4
stdlib/core/Reflection.swift
View File

@@ -207,7 +207,7 @@ func _getSummary<T>(out: UnsafePointer<String>,
inout targetStream: TargetStream
) -> T {
var maxItemCounter = maxItems
var visitedItems = Dictionary<ObjectIdentifier, Int>()
var visitedItems = [ObjectIdentifier : Int]()
_dumpWithMirror(reflect(x), name, indent, maxDepth,
&maxItemCounter, &visitedItems, &targetStream)
return x
@@ -225,7 +225,7 @@ func _getSummary<T>(out: UnsafePointer<String>,
func _dumpWithMirror<TargetStream : OutputStream>(
mirror: Mirror, name: String?, indent: Int, maxDepth: Int,
inout maxItemCounter: Int,
inout visitedItems: Dictionary<ObjectIdentifier, Int>,
inout visitedItems: [ObjectIdentifier : Int],
inout targetStream: TargetStream
) {
if maxItemCounter <= 0 { return }