Skip to content

Commit 938277a

Browse files
committed
Upgrade to Swift 2.2 in Xcode 7.3.
1 parent 72884f4 commit 938277a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
language: objective-c
2-
osx_image: xcode7.2
2+
osx_image: xcode7.3
33
script: xcrun xcodebuild -project Deque.xcodeproj -scheme Deque-Mac test
44
after_success: bash <(curl -s https://codecov.io/bash)

Tests/DequeTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import XCTest
1111

1212
func cast<Source, Target>(value: Source) -> Target { return value as! Target }
1313

14-
func XCTAssertElementsEqual<Element: Equatable, S: SequenceType where S.Generator.Element == Element>(a: S, _ b: [Element], file: StaticString = __FILE__, line: UInt = __LINE__) {
14+
func XCTAssertElementsEqual<Element: Equatable, S: SequenceType where S.Generator.Element == Element>(a: S, _ b: [Element], file: StaticString = #file, line: UInt = #line) {
1515
let aa = Array(a)
1616
if !aa.elementsEqual(b) {
1717
XCTFail("XCTAssertEqual failed: \"\(aa)\" is not equal to \"\(b)\"", file: cast(file), line: line)
@@ -207,7 +207,7 @@ class DequeTests: XCTestCase {
207207
// Add a sequence with inexact underestimateCount()
208208
var i = 101
209209
deque.appendContentsOf(AnySequence<T> {
210-
anyGenerator {
210+
AnyGenerator {
211211
if i > 1000 {
212212
return nil
213213
}
@@ -452,7 +452,7 @@ class DequeTests: XCTestCase {
452452
}
453453

454454
func testInsertionCases() {
455-
func testInsert(elements elements: [T], wrappedAt wrap: Int, insertionIndex: Int, insertedElements: [T], file: StaticString = __FILE__, line: UInt = __LINE__) {
455+
func testInsert(elements elements: [T], wrappedAt wrap: Int, insertionIndex: Int, insertedElements: [T], file: StaticString = #file, line: UInt = #line) {
456456
var deque = dequeWithElements(elements, wrappedAt: wrap)
457457
var expected = elements
458458
expected.insertContentsOf(insertedElements, at: insertionIndex)
@@ -476,7 +476,7 @@ class DequeTests: XCTestCase {
476476

477477

478478
func testRemovalCases() {
479-
func testRemove(elements elements: [T], wrappedAt wrap: Int, range: Range<Int>, file: StaticString = __FILE__, line: UInt = __LINE__) {
479+
func testRemove(elements elements: [T], wrappedAt wrap: Int, range: Range<Int>, file: StaticString = #file, line: UInt = #line) {
480480
var deque = dequeWithElements(elements, wrappedAt: wrap)
481481
var expected = elements
482482
expected.removeRange(range)

0 commit comments

Comments
 (0)