Skip to content

Commit 0e9b210

Browse files
committed
Fix up some warnings
- parameterString will always return a nil value for Swift 5.3 or later - Non-'@objc' class method in extensions cannot be overridden - AnyHashable to NSObject will always success - Use -Decimal.greatestFiniteMagnitude instead of Decimal.leastFiniteMagnitude
1 parent b86ea32 commit 0e9b210

File tree

4 files changed

+6
-24
lines changed

4 files changed

+6
-24
lines changed

Diff for: Sources/Foundation/NSDecimalNumber.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@ open class NSDecimalNumber : NSNumber {
222222
return NSDecimalNumber(integerLiteral: 1)
223223
}
224224
open class var minimum: NSDecimalNumber {
225-
return NSDecimalNumber(decimal:Decimal.leastFiniteMagnitude)
225+
return NSDecimalNumber(decimal: -Decimal.greatestFiniteMagnitude)
226226
}
227227
open class var maximum: NSDecimalNumber {
228-
return NSDecimalNumber(decimal:Decimal.greatestFiniteMagnitude)
228+
return NSDecimalNumber(decimal: Decimal.greatestFiniteMagnitude)
229229

230230
}
231231
open class var notANumber: NSDecimalNumber {

Diff for: Sources/Foundation/NSSet.swift

+1-7
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,7 @@ open class NSSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCodi
7070

7171
public convenience init(set: Set<AnyHashable>, copyItems flag: Bool) {
7272
if flag {
73-
self.init(array: set.map {
74-
if let item = $0 as? NSObject {
75-
return item.copy()
76-
} else {
77-
return $0
78-
}
79-
})
73+
self.init(array: set.map{ ($0 as NSObject).copy() })
8074
} else {
8175
self.init(array: Array(set))
8276
}

Diff for: Sources/Foundation/RunLoop.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ extension RunLoop {
258258
}
259259

260260
@available(*, deprecated, message: "For XCTest use only.")
261-
open func _remove(_ source: _Source, for mode: RunLoop.Mode) {
261+
public func _remove(_ source: _Source, for mode: RunLoop.Mode) {
262262
CFRunLoopRemoveSource(_cfRunLoop, source.cfSource, mode._cfStringUniquingKnown)
263263
}
264264
}

Diff for: Sources/Foundation/URL.swift

+2-14
Original file line numberDiff line numberDiff line change
@@ -655,13 +655,7 @@ public struct URL : ReferenceConvertible, Equatable {
655655
/// - note: This function will resolve against the base `URL`.
656656
/// - returns: The path, or an empty string if the URL has an empty path.
657657
public var path: String {
658-
if let parameterString = _url.parameterString {
659-
if let path = _url.path {
660-
return path + ";" + parameterString
661-
} else {
662-
return ";" + parameterString
663-
}
664-
} else if let path = _url.path {
658+
if let path = _url.path {
665659
return path
666660
} else {
667661
return ""
@@ -676,13 +670,7 @@ public struct URL : ReferenceConvertible, Equatable {
676670
/// - note: This function will resolve against the base `URL`.
677671
/// - returns: The relative path, or an empty string if the URL has an empty path.
678672
public var relativePath: String {
679-
if let parameterString = _url.parameterString {
680-
if let path = _url.relativePath {
681-
return path + ";" + parameterString
682-
} else {
683-
return ";" + parameterString
684-
}
685-
} else if let path = _url.relativePath {
673+
if let path = _url.relativePath {
686674
return path
687675
} else {
688676
return ""

0 commit comments

Comments
 (0)