diff --git a/stdlib/core/Dictionary.swift b/stdlib/core/Dictionary.swift index c4c23d2bf8a..e82d611480a 100644 --- a/stdlib/core/Dictionary.swift +++ b/stdlib/core/Dictionary.swift @@ -1772,8 +1772,8 @@ struct Dictionary : Collection, } @public func == ( - lhs: Dictionary, - rhs: Dictionary + 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 : Collection, } @public func != ( - lhs: Dictionary, - rhs: Dictionary + lhs: [KeyType : ValueType], + rhs: [KeyType : ValueType] ) -> Bool { return !(lhs == rhs) } diff --git a/stdlib/core/Reflection.swift b/stdlib/core/Reflection.swift index 499bdf4f2b1..d8ef86e9a84 100644 --- a/stdlib/core/Reflection.swift +++ b/stdlib/core/Reflection.swift @@ -207,7 +207,7 @@ func _getSummary(out: UnsafePointer, inout targetStream: TargetStream ) -> T { var maxItemCounter = maxItems - var visitedItems = Dictionary() + var visitedItems = [ObjectIdentifier : Int]() _dumpWithMirror(reflect(x), name, indent, maxDepth, &maxItemCounter, &visitedItems, &targetStream) return x @@ -225,7 +225,7 @@ func _getSummary(out: UnsafePointer, func _dumpWithMirror( mirror: Mirror, name: String?, indent: Int, maxDepth: Int, inout maxItemCounter: Int, - inout visitedItems: Dictionary, + inout visitedItems: [ObjectIdentifier : Int], inout targetStream: TargetStream ) { if maxItemCounter <= 0 { return } diff --git a/stdlib/objc/Foundation/Foundation.swift b/stdlib/objc/Foundation/Foundation.swift index 3a14fc784e5..f4684c1963c 100644 --- a/stdlib/objc/Foundation/Foundation.swift +++ b/stdlib/objc/Foundation/Foundation.swift @@ -679,13 +679,13 @@ extension NSDictionary : DictionaryLiteralConvertible { /// The entry point for bridging `NSDictionary` to `Dictionary`. @public func _convertNSDictionaryToDictionary( d: NSDictionary - ) -> Dictionary { - return Dictionary(_cocoaDictionary: reinterpretCast(d)) + ) -> [K : V] { + return [K : V](_cocoaDictionary: reinterpretCast(d)) } /// The entry point for bridging `Dictionary` to `NSDictionary`. @public func _convertDictionaryToNSDictionary( - d: Dictionary + d: [KeyType : ValueType] ) -> NSDictionary { switch d._variantStorage { case .Native(let nativeOwner): @@ -771,7 +771,7 @@ extension Dictionary : _ConditionallyBridgedToObjectiveC { @public static func bridgeFromObjectiveCConditional( x: NSDictionary ) -> Dictionary? { - let anyDict = x as Dictionary + let anyDict = x as [NSObject : AnyObject] if isBridgedVerbatimToObjectiveC(KeyType.self) && isBridgedVerbatimToObjectiveC(ValueType.self) { return Swift._dictionaryDownCastConditional(anyDict) @@ -788,7 +788,7 @@ extension Dictionary : _ConditionallyBridgedToObjectiveC { extension NSDictionary { @conversion @public - func __conversion() -> Dictionary { + func __conversion() -> [NSObject : AnyObject] { return _convertNSDictionaryToDictionary(reinterpretCast(self)) } } @@ -802,7 +802,7 @@ extension Dictionary { extension NSDictionary : Reflectable { @public func getMirror() -> Mirror { - let dict : Dictionary = _convertNSDictionaryToDictionary(self) + let dict : [NSObject : AnyObject] = _convertNSDictionaryToDictionary(self) return reflect(dict) } } diff --git a/stdlib/objc/Foundation/NSStringAPI.swift b/stdlib/objc/Foundation/NSStringAPI.swift index 1e2cc8decc2..a0ab5367728 100644 --- a/stdlib/objc/Foundation/NSStringAPI.swift +++ b/stdlib/objc/Foundation/NSStringAPI.swift @@ -1047,8 +1047,8 @@ extension String { /// Returns a dictionary object initialized with the keys and /// values found in the `String`. @public - func propertyListFromStringsFileFormat() -> Dictionary { - return _ns.propertyListFromStringsFileFormat() as Dictionary + func propertyListFromStringsFileFormat() -> [String : String] { + return _ns.propertyListFromStringsFileFormat() as [String : String] } // - (NSRange)rangeOfCharacterFromSet:(NSCharacterSet *)aSet