Merge pull request #661 from apple/data-associated-type-fixes-3.0

Author: swift-ci

Foundation/Data.swift

@@ -149,7 +149,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
     public typealias Base64DecodingOptions = NSData.Base64DecodingOptions
 
     public typealias Index = Int
-    public typealias Indices = DefaultRandomAccessIndices<Data>
+    public typealias Indices = CountableRange<Int>
 
     internal var _wrapped : _SwiftNSData
 
@@ -652,9 +652,9 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
         }
     }
 
-    public subscript(bounds: Range<Index>) -> MutableRandomAccessSlice<Data> {
+    public subscript(bounds: Range<Index>) -> MutableRangeReplaceableRandomAccessSlice<Data> {
         get {
-            return MutableRandomAccessSlice(base: self, bounds: bounds)
+            return MutableRangeReplaceableRandomAccessSlice(base: self, bounds: bounds)
         }
         set {
             replaceSubrange(bounds, with: newValue.base)
@@ -680,6 +680,11 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
     public func index(after i: Index) -> Index {
         return i + 1
     }
+
+
+    public var indices: CountableRange<Int> {
+        return startIndex..<endIndex
+    }
 
     /// An iterator over the contents of the data.
     ///