Skip to content

[gardening] Switch non mutated vars into lets. #2209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2019
Merged

[gardening] Switch non mutated vars into lets. #2209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions TestFoundation/TestIndexPath.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,16 +721,16 @@ class TestIndexPath: XCTestCase {
let ip1: IndexPath = IndexPath._unconditionallyBridgeFromObjectiveC(nsip1)
XCTAssertEqual(ip1.count, 0)

var ip2: IndexPath = IndexPath._unconditionallyBridgeFromObjectiveC(nsip2)
let ip2: IndexPath = IndexPath._unconditionallyBridgeFromObjectiveC(nsip2)
XCTAssertEqual(ip2.count, 1)
XCTAssertEqual(ip2[0], 1)

var ip3: IndexPath = IndexPath._unconditionallyBridgeFromObjectiveC(nsip3)
let ip3: IndexPath = IndexPath._unconditionallyBridgeFromObjectiveC(nsip3)
XCTAssertEqual(ip3.count, 2)
XCTAssertEqual(ip3[0], 1)
XCTAssertEqual(ip3[1], 2)

var ip4: IndexPath = IndexPath._unconditionallyBridgeFromObjectiveC(nsip4)
let ip4: IndexPath = IndexPath._unconditionallyBridgeFromObjectiveC(nsip4)
XCTAssertEqual(ip4.count, 3)
XCTAssertEqual(ip4[0], 1)
XCTAssertEqual(ip4[1], 2)
Expand Down
14 changes: 7 additions & 7 deletions TestFoundation/TestNSData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,7 +1293,7 @@ extension TestNSData {

func testCopyBytes_undersized() {
let a : [UInt8] = [1, 2, 3, 4, 5]
var data = a.withUnsafeBufferPointer {
let data = a.withUnsafeBufferPointer {
return Data(buffer: $0)
}
let expectedSize = MemoryLayout<UInt8>.stride * a.count
Expand All @@ -1318,7 +1318,7 @@ extension TestNSData {

func testCopyBytes_oversized() {
let a : [Int32] = [1, 0, 1, 0, 1]
var data = a.withUnsafeBufferPointer {
let data = a.withUnsafeBufferPointer {
return Data(buffer: $0)
}
let expectedSize = MemoryLayout<Int32>.stride * a.count
Expand All @@ -1339,7 +1339,7 @@ extension TestNSData {
do {
// Equal sized buffer, data
let a : [UInt8] = [1, 2, 3, 4, 5]
var data = a.withUnsafeBufferPointer {
let data = a.withUnsafeBufferPointer {
return Data(buffer: $0)
}

Expand Down Expand Up @@ -4333,7 +4333,7 @@ extension TestNSData {
}

func test_dropFirst() {
var data = Data([0, 1, 2, 3, 4, 5])
let data = Data([0, 1, 2, 3, 4, 5])
let sliced = data.dropFirst()
XCTAssertEqual(data.count - 1, sliced.count)
XCTAssertEqual(UInt8(1), sliced[1])
Expand All @@ -4344,7 +4344,7 @@ extension TestNSData {
}

func test_dropFirst2() {
var data = Data([0, 1, 2, 3, 4, 5])
let data = Data([0, 1, 2, 3, 4, 5])
let sliced = data.dropFirst(2)
XCTAssertEqual(data.count - 2, sliced.count)
XCTAssertEqual(UInt8(2), sliced[2])
Expand All @@ -4355,7 +4355,7 @@ extension TestNSData {

func test_copyBytes1() {
var array: [UInt8] = [0, 1, 2, 3]
var data = Data(array)
let data = Data(array)

array.withUnsafeMutableBufferPointer {
data[1..<3].copyBytes(to: $0.baseAddress!, from: 1..<3)
Expand All @@ -4365,7 +4365,7 @@ extension TestNSData {

func test_copyBytes2() {
let array: [UInt8] = [0, 1, 2, 3]
var data = Data(array)
let data = Data(array)

let expectedSlice = array[1..<3]

Expand Down
10 changes: 5 additions & 5 deletions TestFoundation/TestStream.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class TestStream : XCTestCase {

let outputStream = OutputStream(toFileAtPath: filePath, append: true)
XCTAssertEqual(.notOpen, outputStream!.streamStatus)
var myString = "Hello world!"
let myString = "Hello world!"
let encodedData = [UInt8](myString.utf8)
outputStream?.open()
XCTAssertEqual(.open, outputStream!.streamStatus)
Expand All @@ -214,7 +214,7 @@ class TestStream : XCTestCase {

func test_outputStreamCreationToBuffer() {
var buffer = Array<UInt8>(repeating: 0, count: 12)
var myString = "Hello world!"
let myString = "Hello world!"
let encodedData = [UInt8](myString.utf8)
let outputStream = OutputStream(toBuffer: UnsafeMutablePointer(mutating: buffer), capacity: 12)
XCTAssertEqual(.notOpen, outputStream.streamStatus)
Expand All @@ -235,7 +235,7 @@ class TestStream : XCTestCase {

let outputStream = OutputStream(url: URL(fileURLWithPath: filePath), append: true)
XCTAssertEqual(.notOpen, outputStream!.streamStatus)
var myString = "Hello world!"
let myString = "Hello world!"
let encodedData = [UInt8](myString.utf8)
outputStream!.open()
XCTAssertEqual(.open, outputStream!.streamStatus)
Expand All @@ -248,7 +248,7 @@ class TestStream : XCTestCase {

func test_outputStreamCreationToMemory(){
var buffer = Array<UInt8>(repeating: 0, count: 12)
var myString = "Hello world!"
let myString = "Hello world!"
let encodedData = [UInt8](myString.utf8)
let outputStream = OutputStream.toMemory()
XCTAssertEqual(.notOpen, outputStream.streamStatus)
Expand All @@ -269,7 +269,7 @@ class TestStream : XCTestCase {

func test_outputStreamHasSpaceAvailable() {
let buffer = Array<UInt8>(repeating: 0, count: 12)
var myString = "Welcome To Hello world !"
let myString = "Welcome To Hello world !"
let encodedData = [UInt8](myString.utf8)
let outputStream = OutputStream(toBuffer: UnsafeMutablePointer(mutating: buffer), capacity: 12)
outputStream.open()
Expand Down