clean up some uses of typed patterns in nested contexts. The only reason anyone was using

them was because of the obsolete AnyObject warning.


Swift SVN r26159
This commit is contained in:
Chris Lattner
2015-03-15 18:26:24 +00:00
parent 522594f717
commit 7b13a367a7
3 changed files with 7 additions and 8 deletions

View File

@@ -2753,8 +2753,7 @@ internal enum _Variant${Self}Storage<${TypeParametersDecl}> : _HashStorageType {
%elif Self == 'Dictionary':
while let elt? = oldCocoaGenerator.next() {
let (key: AnyObject, value: AnyObject) = elt
while let (key, value)? = oldCocoaGenerator.next() {
newNativeStorage.unsafeAddNew(
key: _forceBridgeFromObjectiveC(key, Key.self),
value: _forceBridgeFromObjectiveC(value, Value.self))
@@ -2845,7 +2844,7 @@ internal enum _Variant${Self}Storage<${TypeParametersDecl}> : _HashStorageType {
let nativeValue = _forceBridgeFromObjectiveC(anyObjectValue, Value.self)
return nativeValue
%elif Self == 'Dictionary':
var (anyObjectKey: AnyObject, anyObjectValue: AnyObject) =
var (anyObjectKey, anyObjectValue) =
cocoaStorage.assertingGet(i._cocoaIndex)
let nativeKey = _forceBridgeFromObjectiveC(anyObjectKey, Key.self)
let nativeValue = _forceBridgeFromObjectiveC(anyObjectValue, Value.self)
@@ -3624,8 +3623,7 @@ public struct ${Self}Generator<${TypeParametersDecl}> : GeneratorType {
return _forceBridgeFromObjectiveC(anyObjectElement, T.self)
}
%elif Self == 'Dictionary':
if let elt? = cocoaGenerator.next() {
let (anyObjectKey: AnyObject, anyObjectValue: AnyObject) = elt
if let (anyObjectKey, anyObjectValue)? = cocoaGenerator.next() {
let nativeKey = _forceBridgeFromObjectiveC(anyObjectKey, Key.self)
let nativeValue = _forceBridgeFromObjectiveC(anyObjectValue, Value.self)
return (nativeKey, nativeValue)