Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit f353d02

Browse files
committed
Merge pull request pNre#116 from nickmshelley/remove-range-wrapper
Remove custom range wrapper.
2 parents f1411fc + 69bb392 commit f353d02

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

‎ExSwift/Array.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ internal extension Array {
314314
end = count
315315
}
316316

317-
result += [self[i..end]]
317+
result += [self[i..<end]]
318318

319319
if end != i + n {
320320
break
@@ -348,7 +348,7 @@ internal extension Array {
348348
if n < 1 { n = 0 } // Allow 0 if user wants [[],[],[]] for some reason.
349349

350350
for i in stride(from: 0, to: count, by: step!) {
351-
result += [self[i..(i + n)]]
351+
result += [self[i..<(i + n)]]
352352
}
353353

354354
return result

‎ExSwift/Range.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,3 @@ public func == <U: ForwardIndexType> (first: Range<U>, second: Range<U>) -> Bool
7878
return first.startIndex == second.startIndex &&
7979
first.endIndex == second.endIndex
8080
}
81-
82-
/**
83-
* DP2 style open range operator
84-
*/
85-
public func .. <U : Comparable> (first: U, second: U) -> HalfOpenInterval<U> {
86-
return first..<second
87-
}
88-
89-
public func .. <Pos : ForwardIndexType> (minimum: Pos, maximum: Pos) -> Range<Pos> {
90-
return minimum..<maximum
91-
}

‎ExSwiftTests/ArrayExtensionsTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ class ArrayExtensionsSpec: QuickSpec {
287287

288288
it("take") {
289289

290-
expect(self.intArray.take(2)) == self.intArray[0..2]
290+
expect(self.intArray.take(2)) == self.intArray[0..<2]
291291
expect(self.intArray.take(0)) == []
292292

293293
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /