removed c-style for loops

Daniel Dahan · Daniel Dahan · commit 63d04cdc83bf · 2016-03-25T20:04:52.000-04:00
diff --git a/Sources/RedBlackTree.swift b/Sources/RedBlackTree.swift
@@ -58,7 +58,8 @@ public class RedBlackTree<Key : Comparable, Value> : ProbableType, CollectionTyp
 	*/
 	internal var internalDescription: String {
 		var output: String = "["
-		for var i: Int = 0, l = count - 1; i <= l; ++i {
+		let l: Int = count - 1
+		for i in 0..<count {
 			output += "\(self[i])"
 			if i != l {
 				output += ", "
@@ -765,7 +766,7 @@ public func ==<Key : Comparable, Value>(lhs: RedBlackTree<Key, Value>, rhs: RedB
 	if lhs.count != rhs.count {
 		return false
 	}
-	for var i: Int = lhs.count - 1; 0 <= i; --i {
+	for i in 0..<lhs.count {
 		if lhs[i].key != rhs[i].key {
 			return false
 		}
diff --git a/Sources/SortedDictionary.swift b/Sources/SortedDictionary.swift
@@ -390,7 +390,7 @@ public func ==<Key : Comparable, Value>(lhs: SortedDictionary<Key, Value>, rhs:
 	if lhs.count != rhs.count {
 		return false
 	}
-	for var i: Int = lhs.count - 1; 0 <= i; --i {
+	for i in 0..<lhs.count {
 		if lhs[i].key != rhs[i].key {
 			return false
 		}
diff --git a/Sources/SortedMultiDictionary.swift b/Sources/SortedMultiDictionary.swift
@@ -390,7 +390,7 @@ public func ==<Key : Hashable, Value>(lhs: SortedMultiDictionary<Key, Value>, rh
 	if lhs.count != rhs.count {
 		return false
 	}
-	for var i: Int = lhs.count - 1; 0 <= i; --i {
+	for i in 0..<lhs.count {
 		if lhs[i].key != rhs[i].key {
 			return false
 		}
diff --git a/Sources/SortedMultiSet.swift b/Sources/SortedMultiSet.swift
@@ -62,7 +62,8 @@ public class SortedMultiSet<Element : Comparable> : ProbableType, CollectionType
 	*/
 	public var description: String {
 		var output: String = "["
-		for var i: Int = 0, l = count - 1; i <= l; ++i {
+		let l: Int = count - 1
+		for i in 0..<count {
 			output += "\(self[i])"
 			if i != l {
 				output += ", "
@@ -624,7 +625,7 @@ public func ==<Element: Comparable>(lhs: SortedMultiSet<Element>, rhs: SortedMul
 	if lhs.count != rhs.count {
 		return false
 	}
-	for var i: Int = lhs.count - 1; 0 <= i; --i {
+	for i in 0..<lhs.count {
 		if lhs[i] != rhs[i] {
 			return false
 		}
diff --git a/Sources/SortedSet.swift b/Sources/SortedSet.swift
@@ -62,7 +62,8 @@ public class SortedSet<Element : Comparable> : ProbableType, CollectionType, Com
 	*/
 	public var description: String {
 		var output: String = "["
-		for var i: Int = 0, l = count - 1; i <= l; ++i {
+		let l: Int = count - 1
+		for i in 0..<count {
 			output += "\(self[i])"
 			if i != l {
 				output += ", "
@@ -607,7 +608,7 @@ public func ==<Element: Comparable>(lhs: SortedSet<Element>, rhs: SortedSet<Elem
 	if lhs.count != rhs.count {
 		return false
 	}
-	for var i: Int = lhs.count - 1; 0 <= i; --i {
+	for i in 0..<lhs.count {
 		if lhs[i] != rhs[i] {
 			return false
 		}
diff --git a/Tests/RedBlackTreeTests.swift b/Tests/RedBlackTreeTests.swift
@@ -46,7 +46,7 @@ class RedBlackTreeTests: XCTestCase {
 		
 		XCTAssert(0 == s.count, "Test failed, got \(s.count).")
 		
-		for var i: Int = 1000; 0 < i; --i {
+		for _ in 0..<1000 {
 			s.insert(1, value: 1)
 			s.insert(2, value: 2)
 			s.insert(3, value: 3)
@@ -57,7 +57,7 @@ class RedBlackTreeTests: XCTestCase {
 		XCTAssert(2 == s[1].value, "Test failed.")
 		XCTAssert(3 == s[2].value, "Test failed.")
 		
-		for var i: Int = 500; 0 < i; --i {
+		for _ in 0..<500 {
 			s.removeValueForKeys(1)
 			s.removeValueForKeys(3)
 		}
@@ -77,7 +77,7 @@ class RedBlackTreeTests: XCTestCase {
 		s.insert(2, value: 2)
 		s.insert(3, value: 3)
 		
-		for var i: Int = s.endIndex - 1; i >= s.startIndex; --i {
+		for i in s.startIndex..<s.endIndex {
 			s[i] = (s[i].key, 100)
 			XCTAssert(100 == s[i].value, "Test failed.")
 		}
@@ -113,11 +113,11 @@ class RedBlackTreeTests: XCTestCase {
 		
 		let t3: RedBlackTree<Int, Int> = t1 + t2
 		
-		for var i: Int = t1.count - 1; 0 <= i; --i {
+		for i in 0..<t1.count {
 			XCTAssert(t1[i].value == t3.findValueForKey(t1[i].value!), "Test failed.")
 		}
 		
-		for var i: Int = t2.count - 1; 0 <= i; --i {
+		for i in 0..<t2.count {
 			XCTAssert(t2[i].value == t3.findValueForKey(t2[i].value!), "Test failed.")
 		}
 	}
diff --git a/Tests/SortedDictionaryTests.swift b/Tests/SortedDictionaryTests.swift
@@ -46,7 +46,7 @@ class SortedDictionaryTests: XCTestCase {
 		
 		XCTAssert(0 == s.count, "Test failed, got \(s.count).")
 		
-		for var i: Int = 1000; 0 < i; --i {
+		for _ in 0..<1000 {
 			s.insert((1, 1))
 			s.insert((2, 2))
 			s.insert((3, 3))
@@ -57,7 +57,7 @@ class SortedDictionaryTests: XCTestCase {
 		XCTAssert(2 == s[1].value, "Test failed.")
 		XCTAssert(3 == s[2].value, "Test failed.")
 		
-		for var i: Int = 500; 0 < i; --i {
+		for _ in 0..<500 {
 			s.removeValueForKeys(1)
 			s.removeValueForKeys(3)
 		}
diff --git a/Tests/SortedMultiDictionaryTests.swift b/Tests/SortedMultiDictionaryTests.swift
@@ -46,7 +46,7 @@ class SortedMultiDictionaryTests: XCTestCase {
 		
 		XCTAssert(0 == s.count, "Test failed, got \(s.count).")
 		
-		for var i: Int = 1000; 0 < i; --i {
+		for _ in 0..<1000 {
 			s.insert((1, 1))
 			s.insert((2, 2))
 			s.insert((3, 3))
@@ -57,7 +57,7 @@ class SortedMultiDictionaryTests: XCTestCase {
 		XCTAssert(1 == s[1].value, "Test failed.")
 		XCTAssert(1 == s[2].value, "Test failed.")
 		
-		for var i: Int = 500; 0 < i; --i {
+		for _ in 0..<500 {
 			s.removeValueForKeys(1)
 			s.removeValueForKeys(3)
 		}
diff --git a/Tests/SortedMultiSetTests.swift b/Tests/SortedMultiSetTests.swift
@@ -46,7 +46,7 @@ class SortedMultiSetTests: XCTestCase {
 		
 		XCTAssert(0 == s.count, "Test failed, got \(s.count).")
 		
-		for var i: Int = 1000; i > 0; --i {
+		for _ in 0..<1000 {
 			s.insert(1)
 			s.insert(2)
 			s.insert(3)
@@ -57,7 +57,7 @@ class SortedMultiSetTests: XCTestCase {
 		XCTAssert(2 == s[1000], "Test failed.")
 		XCTAssert(3 == s[2000], "Test failed.")
 		
-		for var i: Int = 500; i > 0; --i {
+		for _ in 0..<500 {
 			s.remove(1)
 			s.remove(3)
 		}
diff --git a/Tests/SortedSetTest.swift b/Tests/SortedSetTest.swift
@@ -46,7 +46,7 @@ class SortedSetTests: XCTestCase {
 		
 		XCTAssert(0 == s.count, "Test failed, got \(s.count).")
 		
-		for var i: Int = 1000; i > 0; --i {
+		for _ in 0..<1000 {
 			s.insert(1)
 			s.insert(2)
 			s.insert(3)
@@ -57,7 +57,7 @@ class SortedSetTests: XCTestCase {
 		XCTAssert(2 == s[1], "Test failed.")
 		XCTAssert(3 == s[2], "Test failed.")
 		
-		for var i: Int = 500; i > 0; --i {
+		for _ in 0..<500 {
 			s.remove(1)
 			s.remove(3)
 		}

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ public func ==<Key : Comparable, Value>(lhs: SortedDictionary<Key, Value>, rhs:`
`390`	`390`	`if lhs.count != rhs.count {`
`391`	`391`	`return false`
`392`	`392`	`}`
`393`		`- for var i: Int = lhs.count - 1; 0 <= i; --i {`
	`393`	`+ for i in 0..<lhs.count {`
`394`	`394`	`if lhs[i].key != rhs[i].key {`
`395`	`395`	`return false`
`396`	`396`	`}`