Remove {Dictionary,Set,UnsafeMutableBufferPointer,UnsafeBufferPointer}.count

These APIs are redundant with APIs that come from protocol extensions.

Swift SVN r28248

Author: gribozavr

stdlib/private/SwiftPrivate/IO.swift

@@ -104,7 +104,7 @@ public struct _FDOutputStream : OutputStreamType {
     utf8.withUnsafeBufferPointer {
       (utf8) -> () in
       var writtenBytes = 0
-      let bufferSize = utf8.count - 1
+      let bufferSize = utf8.count() - 1
       while writtenBytes != bufferSize {
         let result = SwiftShims.write(
           self.fd, UnsafePointer(utf8.baseAddress + Int(writtenBytes)),

stdlib/private/SwiftPrivateDarwinExtras/Subprocess.swift

@@ -117,7 +117,7 @@ internal func _readAll(fd: CInt) -> String {
     let readResult: ssize_t = buffer.withUnsafeMutableBufferPointer {
       (buffer) in
       let ptr = UnsafeMutablePointer<Void>(buffer.baseAddress + usedBytes)
-      return read(fd, ptr, size_t(buffer.count - usedBytes))
+      return read(fd, ptr, size_t(buffer.count() - usedBytes))
     }
     if readResult > 0 {
       usedBytes += readResult

stdlib/public/SDK/CoreAudio/CoreAudio.swift

@@ -36,7 +36,7 @@ extension AudioBuffer {
     _ typedBuffer: UnsafeMutableBufferPointer<T>, numberOfChannels: Int) {
     self.mNumberChannels = UInt32(numberOfChannels)
     self.mData = UnsafeMutablePointer<Void>(typedBuffer.baseAddress)
-    self.mDataByteSize = UInt32(typedBuffer.count * strideof(T))
+    self.mDataByteSize = UInt32(typedBuffer.count() * strideof(T))
   }
 }
 

stdlib/public/core/AssertCommon.swift

@@ -97,9 +97,9 @@ func _assertionFailed(
       file.withUTF8Buffer {
         (file) -> () in
         _reportFatalErrorInFile(
-          prefix.baseAddress, UWord(prefix.count),
-          message.baseAddress, UWord(message.count),
-          file.baseAddress, UWord(file.count), line)
+          prefix.baseAddress, UWord(prefix.count()),
+          message.baseAddress, UWord(message.count()),
+          file.baseAddress, UWord(file.count()), line)
         Builtin.int_trap()
       }
     }
@@ -125,9 +125,9 @@ func _assertionFailed(
       file.withUTF8Buffer {
         (file) -> () in
         _reportFatalErrorInFile(
-          prefix.baseAddress, UWord(prefix.count),
-          messageUTF8.baseAddress, UWord(messageUTF8.count),
-          file.baseAddress, UWord(file.count), line)
+          prefix.baseAddress, UWord(prefix.count()),
+          messageUTF8.baseAddress, UWord(messageUTF8.count()),
+          file.baseAddress, UWord(file.count()), line)
       }
     }
   }
@@ -152,9 +152,9 @@ func _fatalErrorMessage(prefix: StaticString, _ message: StaticString,
       file.withUTF8Buffer {
         (file) in
         _reportFatalErrorInFile(
-          prefix.baseAddress, UWord(prefix.count),
-          message.baseAddress, UWord(message.count),
-          file.baseAddress, UWord(file.count), line)
+          prefix.baseAddress, UWord(prefix.count()),
+          message.baseAddress, UWord(message.count()),
+          file.baseAddress, UWord(file.count()), line)
       }
     }
   }
@@ -195,9 +195,9 @@ func _unimplemented_initializer(className: StaticString,
         file.withUTF8Buffer {
           (file) in
           _reportUnimplementedInitializerInFile(
-            className.baseAddress, UWord(className.count),
-            initName.baseAddress, UWord(initName.count),
-            file.baseAddress, UWord(file.count), line, column)
+            className.baseAddress, UWord(className.count()),
+            initName.baseAddress, UWord(initName.count()),
+            file.baseAddress, UWord(file.count()), line, column)
         }
       }
     }
@@ -207,8 +207,8 @@ func _unimplemented_initializer(className: StaticString,
       initName.withUTF8Buffer {
         (initName) in
         _reportUnimplementedInitializer(
-          className.baseAddress, UWord(className.count),
-          initName.baseAddress, UWord(initName.count))
+          className.baseAddress, UWord(className.count()),
+          initName.baseAddress, UWord(initName.count()))
       }
     }
   }

stdlib/public/core/HashedCollections.swift.gyb

@@ -394,19 +394,12 @@ public struct Set<T : Hashable> :
 
   /// Remove a member from the set and return it. Requires: `count > 0`.
   public mutating func removeFirst() -> T {
-    _precondition(count > 0, "can't removeFirst from an empty Set")
+    _precondition(!isEmpty, "can't removeFirst from an empty Set")
     let member = first!
     remove(member)
     return member
   }
 
-  /// The number of members in the set.
-  ///
-  /// - complexity: O(1)
-  public var count: Int {
-    return _variantStorage.count
-  }
-
   //
   // `SequenceType` conformance
   //
@@ -470,7 +463,7 @@ public struct Set<T : Hashable> :
   /// The first element obtained when iterating, or `nil` if `self` is
   /// empty.  Equivalent to `self.generate().next()`
   public var first: T? {
-    return count > 0 ? self[startIndex] : .None
+    return !isEmpty ? self[startIndex] : .None
   }
 
   /// Returns true if the set is a subset of a finite sequence as a `Set`.
@@ -588,7 +581,7 @@ public struct Set<T : Hashable> :
     // The result can only have fewer or the same number of elements.
     // If no elements were removed, don't perform a reassignment
     // as this may cause an unnecessary uniquing COW.
-    if result.count != count {
+    if result.count() != count() {
       self = result
     }
   }
@@ -646,7 +639,14 @@ public struct Set<T : Hashable> :
 
   /// `true` if the set is empty.
   public var isEmpty: Bool {
-    return count == 0
+    return count() == 0
+  }
+
+  /// The number of members in the set.
+  ///
+  /// - complexity: O(1)
+  public func count() -> Int {
+    return _variantStorage.count
   }
 }
 
@@ -661,7 +661,7 @@ internal func _compareSets<T>(lhs: Set<T>, _ rhs: Set<T>)
       return (false, false)
     }
   }
-  return (true, lhs.count == rhs.count)
+  return (true, lhs.count() == rhs.count())
 }
 
 public func == <T : Hashable>(lhs: Set<T>, rhs: Set<T>) -> Bool {
@@ -785,7 +785,7 @@ public func _setUpCast<DerivedValue, BaseValue>(source: Set<DerivedValue>)
   _sanityCheck(_isClassOrObjCExistential(BaseValue.self))
   _sanityCheck(_isClassOrObjCExistential(DerivedValue.self))
 
-  var builder = _SetBuilder<BaseValue>(count: source.count)
+  var builder = _SetBuilder<BaseValue>(count: source.count())
   for member in source {
     builder.add(member: unsafeBitCast(member, BaseValue.self))
   }
@@ -804,7 +804,7 @@ public func _setBridgeToObjectiveC<SwiftValue, ObjCValue>(
   _sanityCheck(_isClassOrObjCExistential(ObjCValue.self))
   _sanityCheck(!_isBridgedVerbatimToObjectiveC(SwiftValue.self))
 
-  var result = Set<ObjCValue>(minimumCapacity: source.count)
+  var result = Set<ObjCValue>(minimumCapacity: source.count())
   let valueBridgesDirectly =
     _isBridgedVerbatimToObjectiveC(SwiftValue.self) ==
     _isBridgedVerbatimToObjectiveC(ObjCValue.self)
@@ -862,7 +862,7 @@ public func _setDownCastConditional<BaseValue, DerivedValue>(
   _sanityCheck(_isClassOrObjCExistential(BaseValue.self))
   _sanityCheck(_isClassOrObjCExistential(DerivedValue.self))
 
-  var result = Set<DerivedValue>(minimumCapacity: source.count)
+  var result = Set<DerivedValue>(minimumCapacity: source.count())
   for member in source {
     if let derivedMember = member as? DerivedValue {
       result.insert(derivedMember)
@@ -904,7 +904,7 @@ public func _setBridgeFromObjectiveCConditional<
     _isBridgedVerbatimToObjectiveC(SwiftValue.self) ==
       _isBridgedVerbatimToObjectiveC(ObjCValue.self)
 
-  var result = Set<SwiftValue>(minimumCapacity: source.count)
+  var result = Set<SwiftValue>(minimumCapacity: source.count())
   for value in source {
     // Downcast the value.
     var resultValue: SwiftValue
@@ -1114,13 +1114,6 @@ public struct Dictionary<Key : Hashable, Value> :
     _variantStorage.removeAll(keepCapacity: keepCapacity)
   }
 
-  /// The number of entries in the dictionary.
-  ///
-  /// - complexity: O(1)
-  public var count: Int {
-    return _variantStorage.count
-  }
-
   //
   // `SequenceType` conformance
   //
@@ -1177,9 +1170,15 @@ public struct Dictionary<Key : Hashable, Value> :
 
   /// True iff `count == 0`
   public var isEmpty: Bool {
-    return count == 0
+    return count() == 0
   }
 
+  /// The number of entries in the dictionary.
+  ///
+  /// - complexity: O(1)
+  public func count() -> Int {
+    return _variantStorage.count
+  }
 }
 
 public func == <Key : Equatable, Value : Equatable>(
@@ -1266,7 +1265,7 @@ public func != <Key : Equatable, Value : Equatable>(
 
 extension Dictionary : CustomStringConvertible, CustomDebugStringConvertible {
   internal func _makeDescription(isDebug isDebug: Bool) -> String {
-    if count == 0 {
+    if isEmpty {
       return "[:]"
     }
 
@@ -1338,7 +1337,7 @@ public func _dictionaryUpCast<DerivedKey, DerivedValue, BaseKey, BaseValue>(
   _sanityCheck(_isClassOrObjCExistential(DerivedKey.self))
   _sanityCheck(_isClassOrObjCExistential(DerivedValue.self))
 
-  var result = Dictionary<BaseKey, BaseValue>(minimumCapacity: source.count)
+  var result = Dictionary<BaseKey, BaseValue>(minimumCapacity: source.count())
   for (k, v) in source {
     result[unsafeBitCast(k, BaseKey.self)] = unsafeBitCast(v, BaseValue.self)
   }
@@ -1363,7 +1362,7 @@ public func _dictionaryBridgeToObjectiveC<
     _isClassOrObjCExistential(ObjCKey.self) ||
     _isClassOrObjCExistential(ObjCValue.self))
 
-  var result = Dictionary<ObjCKey, ObjCValue>(minimumCapacity: source.count)
+  var result = Dictionary<ObjCKey, ObjCValue>(minimumCapacity: source.count())
   let keyBridgesDirectly =
     _isBridgedVerbatimToObjectiveC(SwiftKey.self) ==
       _isBridgedVerbatimToObjectiveC(ObjCKey.self)
@@ -3726,7 +3725,7 @@ internal class ${Self}Mirror<${TypeParametersDecl}> : MirrorType {
 
   internal var objectIdentifier: ObjectIdentifier? { return nil }
 
-  internal var count: Int { return _mirror.count }
+  internal var count: Int { return _mirror.count() }
 
   internal subscript(i: Int) -> (String, MirrorType) {
     _precondition(i >= 0 && i < count, "MirrorType access out of bounds")

stdlib/public/core/Reflection.swift

@@ -276,7 +276,7 @@ func _dumpWithMirror<TargetStream : OutputStreamType>(
       println(" #\(previous)", &targetStream)
       return
     }
-    let identifier = visitedItems.count
+    let identifier = visitedItems.count()
     visitedItems[id] = identifier
     print(" #\(identifier)", &targetStream)
   }

stdlib/public/core/Repeat.swift

@@ -22,7 +22,7 @@ public struct Repeat<T> : CollectionType {
   /// Construct an instance that contains `count` elements having the
   /// value `repeatedValue`.
   public init(count: Int, repeatedValue: T) {
-    self.count = count
+    self._count = count
     self.repeatedValue = repeatedValue
   }
 
@@ -32,10 +32,10 @@ public struct Repeat<T> : CollectionType {
     return 0
   }
 
-  /// Always equal to `count`, which is one greater than the index of
+  /// Always equal to `count()`, which is one greater than the index of
   /// the last element in a non-empty instance.
   public var endIndex: Index {
-    return count
+    return _count
   }
 
   /// Return a *generator* over the elements of this *sequence*.
@@ -50,12 +50,12 @@ public struct Repeat<T> : CollectionType {
   /// Requires: `position` is a valid position in `self` and
   /// `position != endIndex`.
   public subscript(position: Int) -> T {
-    _precondition(position >= 0 && position < count, "Index out of range")
+    _precondition(position >= 0 && position < _count, "Index out of range")
     return repeatedValue
   }
 
   /// The number of elements in this collection.
-  public var count: Int
+  internal var _count: Int
 
   /// The value of every element in this collection.
   public let repeatedValue: T

stdlib/public/core/SwiftNativeNSArray.swift

@@ -52,14 +52,14 @@ class _SwiftNativeNSArrayWithContiguousStorage
 // Implement the APIs required by NSArray 
 extension _SwiftNativeNSArrayWithContiguousStorage: _NSArrayCoreType {
   @objc internal var count: Int {
-    return withUnsafeBufferOfObjects { $0.count }
+    return withUnsafeBufferOfObjects { $0.count() }
   }
 
   @objc internal final func objectAtIndex(index: Int) -> AnyObject {
     return withUnsafeBufferOfObjects {
       objects in
       _precondition(
-        _isValidArraySubscript(index, objects.count),
+        _isValidArraySubscript(index, objects.count()),
         "Array index out of range")
       return objects[index]
     }
@@ -71,12 +71,12 @@ extension _SwiftNativeNSArrayWithContiguousStorage: _NSArrayCoreType {
     return withUnsafeBufferOfObjects {
       objects in
       _precondition(
-        _isValidArrayIndex(range.location, objects.count),
+        _isValidArrayIndex(range.location, objects.count()),
         "Array index out of range")
 
       _precondition(
         _isValidArrayIndex(
-          range.location + range.length, objects.count),
+          range.location + range.length, objects.count()),
         "Array index out of range")
 
       // These objects are "returned" at +0, so treat them as values to
@@ -105,7 +105,7 @@ extension _SwiftNativeNSArrayWithContiguousStorage: _NSArrayCoreType {
         AutoreleasingUnsafeMutablePointer<AnyObject?>.self)
       enumerationState.state = 1
       state.memory = enumerationState
-      return objects.count
+      return objects.count()
     }
   }
 
@@ -215,7 +215,7 @@ extension _SwiftNativeNSArrayWithContiguousStorage: _NSArrayCoreType {
     }
 
     // Check if elements are bridged verbatim.
-    return _nativeStorage._withVerbatimBridgedUnsafeBuffer { $0.count }
+    return _nativeStorage._withVerbatimBridgedUnsafeBuffer { $0.count() }
       ?? _nativeStorage._getNonVerbatimBridgedCount()
   }
 }

stdlib/public/core/UnsafeBufferPointer.swift.gyb

@@ -87,7 +87,7 @@ public struct Unsafe${Mutable}BufferPointer<T> : ${Mutable}CollectionType {
   }
 
   /// The number of elements in the buffer
-  public var count: Int {
+  public func count() -> Int {
     return _end - _position
   }
 

test/1_stdlib/Algorithm.swift.gyb

@@ -359,9 +359,9 @@ func makeQSortKiller(len: Int) -> [Int] {
   func Compare(x: Int, y : Int) -> Bool {
     if keys[x] == nil && keys[y] == nil {
       if (x == candidate) {
-        keys[x] = keys.count
+        keys[x] = keys.count()
       } else {
-        keys[y] = keys.count
+        keys[y] = keys.count()
       }
     }
     if keys[x] == nil {