Merge pull request swiftlang#25066 from ikesyo/use-isempty-over-count

ikesyo · web-flow · commit 2019a97e5529 · 2019-05-29T00:24:48.000+09:00
[gardening] Use `Collection.isEmpty` over `Collection.count`
diff --git a/stdlib/public/Darwin/Foundation/Collections+DataProtocol.swift b/stdlib/public/Darwin/Foundation/Collections+DataProtocol.swift
@@ -49,7 +49,7 @@ extension Repeated: DataProtocol where Element == UInt8 {
     public typealias Regions = Repeated<Data>
 
     public var regions: Repeated<Data> {
-        guard self.count > 0 else { return repeatElement(Data(), count: 0) }
+        guard !self.isEmpty else { return repeatElement(Data(), count: 0) }
         return repeatElement(Data(CollectionOfOne(self.first!)), count: self.count)
     }
 }
diff --git a/stdlib/public/Darwin/Foundation/Data.swift b/stdlib/public/Darwin/Foundation/Data.swift
@@ -639,7 +639,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
         @inlinable // This is @inlinable as a convenience initializer.
         init(_ srcBuffer: UnsafeRawBufferPointer) {
             self.init(count: srcBuffer.count)
-            if srcBuffer.count > 0 {
+            if !srcBuffer.isEmpty {
                 Swift.withUnsafeMutableBytes(of: &bytes) { dstBuffer in
                     dstBuffer.baseAddress?.copyMemory(from: srcBuffer.baseAddress!, byteCount: srcBuffer.count)
                 }
@@ -729,7 +729,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
 
         @inlinable // This is @inlinable as trivially computable.
         mutating func append(contentsOf buffer: UnsafeRawBufferPointer) {
-            guard buffer.count > 0 else { return }
+            guard !buffer.isEmpty else { return }
             assert(count + buffer.count <= MemoryLayout<Buffer>.size)
             let cnt = count
             _ = Swift.withUnsafeMutableBytes(of: &bytes) { rawBuffer in
@@ -1270,7 +1270,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
 
         @inlinable // This is @inlinable as a trivial initializer.
         init(_ buffer: UnsafeRawBufferPointer) {
-            if buffer.count == 0 {
+            if buffer.isEmpty {
                 self = .empty
             } else if InlineData.canStore(count: buffer.count) {
                 self = .inline(InlineData(buffer))
@@ -1283,7 +1283,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
 
         @inlinable // This is @inlinable as a trivial initializer.
         init(_ buffer: UnsafeRawBufferPointer, owner: AnyObject) {
-            if buffer.count == 0 {
+            if buffer.isEmpty {
                 self = .empty
             } else if InlineData.canStore(count: buffer.count) {
                 self = .inline(InlineData(buffer))
@@ -2313,7 +2313,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
     }
     
     public mutating func append(_ other: Data) {
-        guard other.count > 0 else { return }
+        guard !other.isEmpty else { return }
         other.withUnsafeBytes { (buffer: UnsafeRawBufferPointer) in
             _representation.append(contentsOf: buffer)
         }
diff --git a/stdlib/public/Darwin/Foundation/URL.swift b/stdlib/public/Darwin/Foundation/URL.swift
@@ -586,7 +586,7 @@ public struct URL : ReferenceConvertible, Equatable {
     /// If the data representation is not a legal URL string as ASCII bytes, the URL object may not behave as expected. If the URL cannot be formed then this will return nil.
     @available(macOS 10.11, iOS 9.0, *)
     public init?(dataRepresentation: __shared Data, relativeTo url: __shared URL?, isAbsolute: Bool = false) {
-        guard dataRepresentation.count > 0 else { return nil }
+        guard !dataRepresentation.isEmpty else { return nil }
         
         if isAbsolute {
             _url = URL._converted(from: NSURL(absoluteURLWithDataRepresentation: dataRepresentation, relativeTo: url))
diff --git a/stdlib/public/Darwin/Network/NWListener.swift b/stdlib/public/Darwin/Network/NWListener.swift
@@ -47,8 +47,8 @@ public final class NWListener: CustomDebugStringConvertible {
 			} else {
 				description = String("\(description).*")
 			}
-			if txtRecord != nil && txtRecord!.count > 0 {
-				description = String("\(description) <\(txtRecord!.count) bytes of txt>")
+			if let txtRecord = txtRecord, !txtRecord.isEmpty {
+				description = String("\(description) <\(txtRecord.count) bytes of txt>")
 			}
 			return description
 		}
diff --git a/stdlib/public/core/CollectionDifference.swift b/stdlib/public/core/CollectionDifference.swift
@@ -89,7 +89,7 @@ public struct CollectionDifference<ChangeElement> {
   private static func _validateChanges<Changes: Collection>(
     _ changes : Changes
   ) -> Bool where Changes.Element == Change {
-    if changes.count == 0 { return true }
+    if changes.isEmpty { return true }
 
     var insertAssocToOffset = Dictionary<Int,Int>()
     var removeOffsetToAssoc = Dictionary<Int,Int>()
@@ -181,7 +181,7 @@ public struct CollectionDifference<ChangeElement> {
 
     // Find first insertion via binary search
     let firstInsertIndex: Int
-    if sortedChanges.count == 0 {
+    if sortedChanges.isEmpty {
       firstInsertIndex = 0
     } else {
       var range = 0...sortedChanges.count
diff --git a/stdlib/public/core/DebuggerSupport.swift b/stdlib/public/core/DebuggerSupport.swift
@@ -119,7 +119,7 @@ public enum _DebuggerSupport {
     isRoot: Bool
   ) -> Bool {
     if isRoot || collectionStatus.isCollection { return true }
-    if mirror.children.count > 0 { return true }
+    if !mirror.children.isEmpty { return true }
     if mirror.displayStyle == .`class` { return true }
     if let sc = mirror.superclassMirror { return ivarCount(mirror: sc) > 0 }
     return true
diff --git a/stdlib/public/core/Dictionary.swift b/stdlib/public/core/Dictionary.swift
@@ -1678,7 +1678,7 @@ extension Collection {
   internal func _makeKeyValuePairDescription<K, V>(
     withTypeName type: String? = nil
   ) -> String where Element == (key: K, value: V) {
-    if self.count == 0 {
+    if self.isEmpty {
       return "[:]"
     }
     
diff --git a/stdlib/public/core/KeyPath.swift b/stdlib/public/core/KeyPath.swift
@@ -1720,7 +1720,7 @@ internal struct KeyPathBuffer {
 
     // fetch type, which is in the buffer unless it's the final component
     let nextType: Any.Type?
-    if data.count == 0 {
+    if data.isEmpty {
       nextType = nil
     } else {
       nextType = _pop(from: &data, as: Any.Type.self)
@@ -2244,7 +2244,7 @@ internal func _appendingKeyPaths<
           }
         }
         
-        _internalInvariant(destBuffer.count == 0,
+        _internalInvariant(destBuffer.isEmpty,
                      "did not fill entire result buffer")
       }
 
diff --git a/stdlib/public/core/StringUTF8Validation.swift b/stdlib/public/core/StringUTF8Validation.swift
@@ -154,7 +154,7 @@ internal func validateUTF8(_ buf: UnsafeBufferPointer<UInt8>) -> UTF8ValidationR
 }
 
 internal func repairUTF8(_ input: UnsafeBufferPointer<UInt8>, firstKnownBrokenRange: Range<Int>) -> String {
-  _internalInvariant(input.count > 0, "empty input doesn't need to be repaired")
+  _internalInvariant(!input.isEmpty, "empty input doesn't need to be repaired")
   _internalInvariant(firstKnownBrokenRange.clamped(to: input.indices) == firstKnownBrokenRange)
   // During this process, `remainingInput` contains the remaining bytes to process. It's split into three
   // non-overlapping sub-regions:
@@ -176,8 +176,8 @@ internal func repairUTF8(_ input: UnsafeBufferPointer<UInt8>, firstKnownBrokenRa
   var brokenRange: Range<Int> = firstKnownBrokenRange
   var remainingInput = input
   repeat {
-    _internalInvariant(brokenRange.count > 0, "broken range empty")
-    _internalInvariant(remainingInput.count > 0, "empty remaining input doesn't need to be repaired")
+    _internalInvariant(!brokenRange.isEmpty, "broken range empty")
+    _internalInvariant(!remainingInput.isEmpty, "empty remaining input doesn't need to be repaired")
     let goodChunk = remainingInput[..<brokenRange.startIndex]
 
     // very likely this capacity reservation does not actually do anything because we reserved space for the entire
@@ -199,6 +199,6 @@ internal func repairUTF8(_ input: UnsafeBufferPointer<UInt8>, firstKnownBrokenRa
     case .error(let newBrokenRange):
       brokenRange = newBrokenRange
     }
-  } while remainingInput.count > 0
+  } while !remainingInput.isEmpty
   return String(result)
 }
diff --git a/stdlib/public/core/VarArgs.swift b/stdlib/public/core/VarArgs.swift
@@ -201,7 +201,7 @@ public func _encodeBitsAsWords<T>(_ x: T) -> [Int] {
   let result = [Int](
     repeating: 0,
     count: (MemoryLayout<T>.size + MemoryLayout<Int>.size - 1) / MemoryLayout<Int>.size)
-  _internalInvariant(result.count > 0)
+  _internalInvariant(!result.isEmpty)
   var tmp = x
   // FIXME: use UnsafeMutablePointer.assign(from:) instead of memcpy.
   _memcpy(dest: UnsafeMutablePointer(result._baseAddressIfContiguous!),
diff --git a/test/Prototypes/BigInt.swift b/test/Prototypes/BigInt.swift
@@ -95,7 +95,7 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
 
   /// A Boolean value indicating whether this instance is equal to zero.
   public var isZero: Bool {
-    return _data.count == 0
+    return _data.isEmpty
   }
 
   //===--- Numeric initializers -------------------------------------------===//
@@ -212,7 +212,7 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
   /// - `_data` has no trailing zero elements
   /// - If `self == 0`, then `isNegative == false`
   func _checkInvariants(source: String = #function) {
-    if _data.count == 0 {
+    if _data.isEmpty {
       assert(isNegative == false,
         "\(source): isNegative with zero length _data")
     }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ extension Repeated: DataProtocol where Element == UInt8 {`
`49`	`49`	`public typealias Regions = Repeated<Data>`
`50`	`50`
`51`	`51`	`public var regions: Repeated<Data> {`
`52`		`- guard self.count > 0 else { return repeatElement(Data(), count: 0) }`
	`52`	`+ guard !self.isEmpty else { return repeatElement(Data(), count: 0) }`
`53`	`53`	`return repeatElement(Data(CollectionOfOne(self.first!)), count: self.count)`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ public final class NWListener: CustomDebugStringConvertible {`
`47`	`47`	`} else {`
`48`	`48`	`description = String("\(description).*")`
`49`	`49`	`}`
`50`		`- if txtRecord != nil && txtRecord!.count > 0 {`
`51`		`- description = String("\(description) <\(txtRecord!.count) bytes of txt>")`
	`50`	`+ if let txtRecord = txtRecord, !txtRecord.isEmpty {`
	`51`	`+ description = String("\(description) <\(txtRecord.count) bytes of txt>")`
`52`	`52`	`}`
`53`	`53`	`return description`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1678,7 +1678,7 @@ extension Collection {`
`1678`	`1678`	`internal func _makeKeyValuePairDescription<K, V>(`
`1679`	`1679`	`withTypeName type: String? = nil`
`1680`	`1680`	`) -> String where Element == (key: K, value: V) {`
`1681`		`- if self.count == 0 {`
	`1681`	`+ if self.isEmpty {`
`1682`	`1682`	`return "[:]"`
`1683`	`1683`	`}`
`1684`	`1684`
Original file line number	Diff line number	Diff line change
`@@ -1720,7 +1720,7 @@ internal struct KeyPathBuffer {`
`1720`	`1720`
`1721`	`1721`	`// fetch type, which is in the buffer unless it's the final component`
`1722`	`1722`	`let nextType: Any.Type?`
`1723`		`- if data.count == 0 {`
	`1723`	`+ if data.isEmpty {`
`1724`	`1724`	`nextType = nil`
`1725`	`1725`	`} else {`
`1726`	`1726`	`nextType = _pop(from: &data, as: Any.Type.self)`
`@@ -2244,7 +2244,7 @@ internal func _appendingKeyPaths<`
`2244`	`2244`	`}`
`2245`	`2245`	`}`
`2246`	`2246`
`2247`		`- _internalInvariant(destBuffer.count == 0,`
	`2247`	`+ _internalInvariant(destBuffer.isEmpty,`
`2248`	`2248`	`"did not fill entire result buffer")`
`2249`	`2249`	`}`
`2250`	`2250`