[stdlib] Fixing a duplicate declaration bug

Dave Abrahams · Dave Abrahams · commit 3105ef9bf1d2 · 2016-05-02T12:02:27.000-07:00
diff --git a/stdlib/public/core/EmptyCollection.swift b/stdlib/public/core/EmptyCollection.swift
@@ -34,8 +34,6 @@ public struct EmptyIterator<Element> : IteratorProtocol, Sequence {
 public struct EmptyCollection<Element> :
   RandomAccessCollection, MutableCollection, Equatable
 {
-  public typealias Indices = CountableRange<Int>
-  
   /// A type that represents a valid position in the collection.
   ///
   /// Valid indices consist of the position of every element and a
@@ -150,10 +148,6 @@ public struct EmptyCollection<Element> :
   }
 
   public typealias Indices = CountableRange<Int>
-
-  public var indices: CountableRange<Int> {
-    return startIndex..<endIndex
-  }
 }
 
 public func == <Element>(

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ public struct EmptyIterator<Element> : IteratorProtocol, Sequence {`
`34`	`34`	`public struct EmptyCollection<Element> :`
`35`	`35`	`RandomAccessCollection, MutableCollection, Equatable`
`36`	`36`	`{`
`37`		`- public typealias Indices = CountableRange<Int>`
`38`		`-`
`39`	`37`	`/// A type that represents a valid position in the collection.`
`40`	`38`	`///`
`41`	`39`	`/// Valid indices consist of the position of every element and a`
`@@ -150,10 +148,6 @@ public struct EmptyCollection<Element> :`
`150`	`148`	`}`
`151`	`149`
`152`	`150`	`public typealias Indices = CountableRange<Int>`
`153`		`-`
`154`		`- public var indices: CountableRange<Int> {`
`155`		`- return startIndex..<endIndex`
`156`		`- }`
`157`	`151`	`}`
`158`	`152`
`159`	`153`	`public func == <Element>(`