Skip to content

Commit 9cf67d2

Browse files
phauslerphausler
authored
id as Any conversion of NSCopying and NSMutableCopying (#515)
1 parent 05c23ea commit 9cf67d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+127
-127
lines changed

‎Foundation/Boxing.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ internal protocol _SwiftNativeFoundationType : class {
7373
init(unmanagedImmutableObject: Unmanaged<ImmutableType>)
7474
init(unmanagedMutableObject: Unmanaged<MutableType>)
7575

76-
func mutableCopy(with zone : NSZone) -> AnyObject
76+
func mutableCopy(with zone : NSZone) -> Any
7777

7878
var hashValue: Int { get }
7979
var description: String { get }
@@ -113,7 +113,7 @@ extension _SwiftNativeFoundationType {
113113
}
114114
}
115115

116-
func mutableCopy(with zone : NSZone) -> AnyObject {
116+
func mutableCopy(with zone : NSZone) -> Any {
117117
return _mapUnmanaged { ($0 as NSObject).mutableCopy() }
118118
}
119119

‎Foundation/CharacterSet.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
103103

104104
internal init(_bridged characterSet: NSCharacterSet) {
105105
// We must copy the input because it might be mutable; just like storing a value type in ObjC
106-
_wrapped = _SwiftNSCharacterSet(immutableObject: characterSet.copy())
106+
_wrapped = _SwiftNSCharacterSet(immutableObject: characterSet.copy() as! NSObject)
107107
}
108108

109109
/// Initialize an empty instance.

‎Foundation/Data.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public struct Data : ReferenceConvertible, CustomStringConvertible, Equatable, H
288288

289289
internal init(_bridged data: NSData) {
290290
// We must copy the input because it might be mutable; just like storing a value type in ObjC
291-
_wrapped = _SwiftNSData(immutableObject: data.copy())
291+
_wrapped = _SwiftNSData(immutableObject: data.copy() as! NSObject)
292292
}
293293

294294
// -----------------------------------

‎Foundation/NSAffineTransform.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ open class NSAffineTransform : NSObject, NSCopying, NSSecureCoding {
3636
open func encode(with aCoder: NSCoder) {
3737
NSUnimplemented()
3838
}
39-
open func copy(with zone: NSZone? = nil) -> AnyObject {
39+
open func copy(with zone: NSZone? = nil) -> Any {
4040
return NSAffineTransform(transform: self)
4141
}
4242
// Necessary because `NSObject.copy()` returns `self`.
43-
open override func copy() -> AnyObject {
43+
open override func copy() -> Any {
4444
return copy(with: nil)
4545
}
4646
public required init?(coder aDecoder: NSCoder) {

‎Foundation/NSArray.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ open class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
109109
return true
110110
}
111111

112-
open override func copy() -> AnyObject {
112+
open override func copy() -> Any {
113113
return copy(with: nil)
114114
}
115115

116-
open func copy(with zone: NSZone? = nil) -> AnyObject {
116+
open func copy(with zone: NSZone? = nil) -> Any {
117117
if type(of: self) === NSArray.self {
118118
// return self for immutable type
119119
return self
@@ -125,11 +125,11 @@ open class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
125125
return NSArray(array: self.allObjects)
126126
}
127127

128-
open override func mutableCopy() -> AnyObject {
128+
open override func mutableCopy() -> Any {
129129
return mutableCopy(with: nil)
130130
}
131131

132-
open func mutableCopy(with zone: NSZone? = nil) -> AnyObject {
132+
open func mutableCopy(with zone: NSZone? = nil) -> Any {
133133
if type(of: self) === NSArray.self || type(of: self) === NSMutableArray.self {
134134
// always create and return an NSMutableArray
135135
let mutableArray = NSMutableArray()
@@ -150,7 +150,7 @@ open class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
150150
public convenience init(array: [AnyObject], copyItems: Bool) {
151151
let optionalArray : [AnyObject?] =
152152
copyItems ?
153-
array.map { return Optional<AnyObject>(($0 as! NSObject).copy()) } :
153+
array.map { return Optional<AnyObject>(($0 as! NSObject).copy() as! NSObject) } :
154154
array.map { return Optional<AnyObject>($0) }
155155

156156
// This would have been nice, but "initializer delegation cannot be nested in another expression"

‎Foundation/NSAttributedString.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ open class AttributedString: NSObject, NSCopying, NSMutableCopying, NSSecureCodi
2727
return true
2828
}
2929

30-
open override func copy() -> AnyObject {
30+
open override func copy() -> Any {
3131
return copy(with: nil)
3232
}
3333

34-
open func copy(with zone: NSZone? = nil) -> AnyObject {
34+
open func copy(with zone: NSZone? = nil) -> Any {
3535
NSUnimplemented()
3636
}
3737

38-
open override func mutableCopy() -> AnyObject {
38+
open override func mutableCopy() -> Any {
3939
return mutableCopy(with: nil)
4040
}
4141

42-
open func mutableCopy(with zone: NSZone? = nil) -> AnyObject {
42+
open func mutableCopy(with zone: NSZone? = nil) -> Any {
4343
NSUnimplemented()
4444
}
4545

‎Foundation/NSCFCharacterSet.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ internal class _NSCFCharacterSet : NSMutableCharacterSet {
3838
return CFCharacterSetHasMemberInPlane(_cfObject, CFIndex(plane))
3939
}
4040

41-
override func copy() -> AnyObject {
41+
override func copy() -> Any {
4242
return copy(with: nil)
4343
}
4444

45-
override func copy(with zone: NSZone? = nil) -> AnyObject {
45+
override func copy(with zone: NSZone? = nil) -> Any {
4646
return CFCharacterSetCreateCopy(kCFAllocatorSystemDefault, self._cfObject)
4747
}
4848

49-
override func mutableCopy(with zone: NSZone? = nil) -> AnyObject {
49+
override func mutableCopy(with zone: NSZone? = nil) -> Any {
5050
return CFCharacterSetCreateMutableCopy(kCFAllocatorSystemDefault, _cfObject)._nsObject
5151
}
5252

‎Foundation/NSCFString.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,11 @@ internal func _CFSwiftStringCreateWithSubstring(_ str: AnyObject, range: CFRange
171171

172172

173173
internal func _CFSwiftStringCreateCopy(_ str: AnyObject) -> Unmanaged<AnyObject> {
174-
return Unmanaged<AnyObject>.passRetained((str as! NSString).copy(with: nil))
174+
return Unmanaged<AnyObject>.passRetained((str as! NSString).copy() as! NSObject)
175175
}
176176

177177
internal func _CFSwiftStringCreateMutableCopy(_ str: AnyObject) -> Unmanaged<AnyObject> {
178-
return Unmanaged<AnyObject>.passRetained((str as! NSString).mutableCopy(with: nil))
178+
return Unmanaged<AnyObject>.passRetained((str as! NSString).mutableCopy() as! NSObject)
179179
}
180180

181181
internal func _CFSwiftStringFastCStringContents(_ str: AnyObject) -> UnsafePointer<Int8>? {

‎Foundation/NSCalendar.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@ open class NSCalendar: NSObject, NSCopying, NSSecureCoding {
185185
return true
186186
}
187187

188-
open override func copy() -> AnyObject {
188+
open override func copy() -> Any {
189189
return copy(with: nil)
190190
}
191191

192-
open func copy(with zone: NSZone? = nil) -> AnyObject {
192+
open func copy(with zone: NSZone? = nil) -> Any {
193193
let copy = NSCalendar(identifier: calendarIdentifier)!
194194
copy.locale = locale
195195
copy.timeZone = timeZone
@@ -1418,11 +1418,11 @@ open class NSDateComponents : NSObject, NSCopying, NSSecureCoding {
14181418
return true
14191419
}
14201420

1421-
open override func copy() -> AnyObject {
1421+
open override func copy() -> Any {
14221422
return copy(with: nil)
14231423
}
14241424

1425-
open func copy(with zone: NSZone? = nil) -> AnyObject {
1425+
open func copy(with zone: NSZone? = nil) -> Any {
14261426
NSUnimplemented()
14271427
}
14281428

‎Foundation/NSCharacterSet.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {
190190
return CFCharacterSetHasMemberInPlane(_cfObject, CFIndex(plane))
191191
}
192192

193-
open override func copy() -> AnyObject {
193+
open override func copy() -> Any {
194194
return copy(with: nil)
195195
}
196196

197-
open func copy(with zone: NSZone? = nil) -> AnyObject {
197+
open func copy(with zone: NSZone? = nil) -> Any {
198198
if type(of: self) == NSCharacterSet.self || type(of: self) == NSMutableCharacterSet.self {
199199
return _CFCharacterSetCreateCopy(kCFAllocatorSystemDefault, self._cfObject)
200200
} else if type(of: self) == _NSCFCharacterSet.self {
@@ -204,11 +204,11 @@ open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSCoding {
204204
}
205205
}
206206

207-
open override func mutableCopy() -> AnyObject {
207+
open override func mutableCopy() -> Any {
208208
return mutableCopy(with: nil)
209209
}
210210

211-
open func mutableCopy(with zone: NSZone? = nil) -> AnyObject {
211+
open func mutableCopy(with zone: NSZone? = nil) -> Any {
212212
if type(of: self) == NSCharacterSet.self || type(of: self) == NSMutableCharacterSet.self {
213213
return _CFCharacterSetCreateMutableCopy(kCFAllocatorSystemDefault, _cfObject)._nsObject
214214
} else if type(of: self) == _NSCFCharacterSet.self {

‎Foundation/NSData.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,19 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
142142
return UnsafeRawPointer(CFDataGetBytePtr(_cfObject))
143143
}
144144

145-
open override func copy() -> AnyObject {
145+
open override func copy() -> Any {
146146
return copy(with: nil)
147147
}
148148

149-
open func copy(with zone: NSZone? = nil) -> AnyObject {
149+
open func copy(with zone: NSZone? = nil) -> Any {
150150
return self
151151
}
152152

153-
open override func mutableCopy() -> AnyObject {
153+
open override func mutableCopy() -> Any {
154154
return mutableCopy(with: nil)
155155
}
156156

157-
open func mutableCopy(with zone: NSZone? = nil) -> AnyObject {
157+
open func mutableCopy(with zone: NSZone? = nil) -> Any {
158158
return NSMutableData(bytes: UnsafeMutableRawPointer(mutating: bytes), length: length, copy: true, deallocator: nil)
159159
}
160160

@@ -634,7 +634,7 @@ open class NSMutableData : NSData {
634634
}
635635
}
636636

637-
open override func copy(with zone: NSZone? = nil) -> AnyObject {
637+
open override func copy(with zone: NSZone? = nil) -> Any {
638638
return NSData(bytes: bytes, length: length)
639639
}
640640
}

‎Foundation/NSDate.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ open class NSDate : NSObject, NSCopying, NSSecureCoding, NSCoding {
7878
}
7979
}
8080

81-
open override func copy() -> AnyObject {
81+
open override func copy() -> Any {
8282
return copy(with: nil)
8383
}
8484

85-
open func copy(with zone: NSZone? = nil) -> AnyObject {
85+
open func copy(with zone: NSZone? = nil) -> Any {
8686
return self
8787
}
8888

@@ -300,7 +300,7 @@ open class NSDateInterval : NSObject, NSCopying, NSSecureCoding {
300300
self.init(start: startDate, duration: endDate.timeIntervalSince(startDate))
301301
}
302302

303-
open func copy(with zone: NSZone?) -> AnyObject {
303+
open func copy(with zone: NSZone?) -> Any {
304304
return NSDateInterval(start: startDate, duration: duration)
305305
}
306306

‎Foundation/NSDictionary.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,11 @@ open class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCoding,
171171
return true
172172
}
173173

174-
open override func copy() -> AnyObject {
174+
open override func copy() -> Any {
175175
return copy(with: nil)
176176
}
177177

178-
open func copy(with zone: NSZone? = nil) -> AnyObject {
178+
open func copy(with zone: NSZone? = nil) -> Any {
179179
if type(of: self) === NSDictionary.self {
180180
// return self for immutable type
181181
return self
@@ -187,11 +187,11 @@ open class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCoding,
187187
return NSDictionary(objects: self.allValues, forKeys: self.allKeys.map({ $0 as! NSObject}))
188188
}
189189

190-
open override func mutableCopy() -> AnyObject {
190+
open override func mutableCopy() -> Any {
191191
return mutableCopy(with: nil)
192192
}
193193

194-
open func mutableCopy(with zone: NSZone? = nil) -> AnyObject {
194+
open func mutableCopy(with zone: NSZone? = nil) -> Any {
195195
if type(of: self) === NSDictionary.self || type(of: self) === NSMutableDictionary.self {
196196
// always create and return an NSMutableDictionary
197197
let mutableDictionary = NSMutableDictionary()

‎Foundation/NSError.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ open class NSError : NSObject, NSCopying, NSSecureCoding, NSCoding {
101101
}
102102
}
103103

104-
open override func copy() -> AnyObject {
104+
open override func copy() -> Any {
105105
return copy(with: nil)
106106
}
107107

108-
open func copy(with zone: NSZone? = nil) -> AnyObject {
108+
open func copy(with zone: NSZone? = nil) -> Any {
109109
return self
110110
}
111111

‎Foundation/NSExpression.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ open class NSExpression : NSObject, NSSecureCoding, NSCopying {
4242
NSUnimplemented()
4343
}
4444

45-
open override func copy() -> AnyObject {
45+
open override func copy() -> Any {
4646
return copy(with: nil)
4747
}
4848

49-
open func copy(with zone: NSZone? = nil) -> AnyObject {
49+
open func copy(with zone: NSZone? = nil) -> Any {
5050
NSUnimplemented()
5151
}
5252

‎Foundation/NSFormatter.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ open class Formatter : NSObject, NSCopying, NSCoding {
5757

5858
}
5959

60-
open override func copy() -> AnyObject {
60+
open override func copy() -> Any {
6161
return copy(with: nil)
6262
}
6363

64-
open func copy(with zone: NSZone? = nil) -> AnyObject {
64+
open func copy(with zone: NSZone? = nil) -> Any {
6565
return self
6666
}
6767

‎Foundation/NSIndexPath.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ open class NSIndexPath: NSObject, NSCopying, NSSecureCoding {
2222
_indexes = indexes
2323
}
2424

25-
open override func copy() -> AnyObject {
25+
open override func copy() -> Any {
2626
return copy(with: nil)
2727
}
2828

29-
open func copy(with zone: NSZone? = nil) -> AnyObject { NSUnimplemented() }
29+
open func copy(with zone: NSZone? = nil) -> Any { NSUnimplemented() }
3030
public convenience init(index: Int) {
3131
self.init(indexes: [index])
3232
}

‎Foundation/NSIndexSet.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ open class NSIndexSet: NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
7474
_count = indexSet.count
7575
}
7676

77-
open override func copy() -> AnyObject {
77+
open override func copy() -> Any {
7878
return copy(with: nil)
7979
}
8080

81-
open func copy(with zone: NSZone? = nil) -> AnyObject { NSUnimplemented() }
81+
open func copy(with zone: NSZone? = nil) -> Any { NSUnimplemented() }
8282

83-
open override func mutableCopy() -> AnyObject {
83+
open override func mutableCopy() -> Any {
8484
return mutableCopy(with: nil)
8585
}
8686

87-
open func mutableCopy(with zone: NSZone? = nil) -> AnyObject {
87+
open func mutableCopy(with zone: NSZone? = nil) -> Any {
8888
let set = NSMutableIndexSet()
8989
enumerateRanges([]) {
9090
set.add(in: $0.0)

‎Foundation/NSKeyedCoderOldStyleArray.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ internal final class _NSKeyedCoderOldStyleArray : NSObject, NSCopying, NSSecureC
9999
}
100100
}
101101

102-
override func copy() -> AnyObject {
102+
override func copy() -> Any {
103103
return copy(with: nil)
104104
}
105105

106-
func copy(with zone: NSZone? = nil) -> AnyObject {
106+
func copy(with zone: NSZone? = nil) -> Any {
107107
return self
108108
}
109109
}

‎Foundation/NSLocale.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ open class NSLocale: NSObject, NSCopying, NSSecureCoding {
5151
}
5252
}
5353

54-
open override func copy() -> AnyObject {
54+
open override func copy() -> Any {
5555
return copy(with: nil)
5656
}
5757

58-
open func copy(with zone: NSZone? = nil) -> AnyObject {
58+
open func copy(with zone: NSZone? = nil) -> Any {
5959
return self
6060
}
6161

‎Foundation/NSMeasurement.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ open class NSMeasurement : NSObject, NSCopying, NSSecureCoding {
3131

3232
open func subtracting(_ measurement: Measurement<Unit>) -> Measurement<Unit> { NSUnimplemented() }
3333

34-
open func copy(with zone: NSZone? = nil) -> AnyObject { NSUnimplemented() }
34+
open func copy(with zone: NSZone? = nil) -> Any { NSUnimplemented() }
3535

3636
open class func supportsSecureCoding() -> Bool { return true }
3737

0 commit comments

Comments
 (0)