From 395d64f54c4187b8e00eff08cef5326b09206f00 Mon Sep 17 00:00:00 2001 From: Jawwad Ahmad Date: Sat, 5 Dec 2015 20:55:25 +0500 Subject: [PATCH] [stdlib] Use type inference for Bool vars --- stdlib/private/SwiftPrivate/IO.swift | 6 +++--- stdlib/public/SDK/Foundation/Foundation.swift | 2 +- stdlib/public/SDK/XCTest/XCTest.swift | 4 ++-- stdlib/public/core/Stride.swift | 2 +- stdlib/public/core/Zip.swift | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stdlib/private/SwiftPrivate/IO.swift b/stdlib/private/SwiftPrivate/IO.swift index 59b73711768dd..b61e2eacec472 100644 --- a/stdlib/private/SwiftPrivate/IO.swift +++ b/stdlib/private/SwiftPrivate/IO.swift @@ -14,8 +14,8 @@ import SwiftShims public struct _FDInputStream { public let fd: CInt - public var isClosed: Bool = false - public var isEOF: Bool = false + public var isClosed = false + public var isEOF = false internal var _buffer = [UInt8](count: 256, repeatedValue: 0) internal var _bufferUsed: Int = 0 @@ -93,7 +93,7 @@ public struct _Stderr : OutputStreamType { public struct _FDOutputStream : OutputStreamType { public let fd: CInt - public var isClosed: Bool = false + public var isClosed = false public init(fd: CInt) { self.fd = fd diff --git a/stdlib/public/SDK/Foundation/Foundation.swift b/stdlib/public/SDK/Foundation/Foundation.swift index d2eaa0d7b0249..965aa65fc6dd6 100644 --- a/stdlib/public/SDK/Foundation/Foundation.swift +++ b/stdlib/public/SDK/Foundation/Foundation.swift @@ -788,7 +788,7 @@ public struct NSIndexSetGenerator : GeneratorType { public typealias Element = Int internal let _set: NSIndexSet - internal var _first: Bool = true + internal var _first = true internal var _current: Int? internal init(set: NSIndexSet) { diff --git a/stdlib/public/SDK/XCTest/XCTest.swift b/stdlib/public/SDK/XCTest/XCTest.swift index e5b0309d432b3..28c91d8c5a495 100644 --- a/stdlib/public/SDK/XCTest/XCTest.swift +++ b/stdlib/public/SDK/XCTest/XCTest.swift @@ -600,7 +600,7 @@ public func XCTAssertEqualWithAccuracy(@autoclosure expre let expressionValue1 = expressionValue1Optional! let expressionValue2 = expressionValue2Optional! - var equalWithAccuracy: Bool = false + var equalWithAccuracy = false switch (expressionValue1, expressionValue2, accuracy) { case let (expressionValue1Double as Double, expressionValue2Double as Double, accuracyDouble as Double): @@ -668,7 +668,7 @@ public func XCTAssertNotEqualWithAccuracy(@autoclosure ex let expressionValue1 = expressionValue1Optional! let expressionValue2 = expressionValue2Optional! - var notEqualWithAccuracy: Bool = false + var notEqualWithAccuracy = false switch (expressionValue1, expressionValue2, accuracy) { case let (expressionValue1Double as Double, expressionValue2Double as Double, accuracyDouble as Double): diff --git a/stdlib/public/core/Stride.swift b/stdlib/public/core/Stride.swift index 10c855c676000..66f8e449ed7d2 100644 --- a/stdlib/public/core/Stride.swift +++ b/stdlib/public/core/Stride.swift @@ -194,7 +194,7 @@ public struct StrideThroughGenerator : GeneratorType { var current: Element let end: Element let stride: Element.Stride - var done: Bool = false + var done = false /// Advance to the next element and return it, or `nil` if no next /// element exists. diff --git a/stdlib/public/core/Zip.swift b/stdlib/public/core/Zip.swift index 1eccb37149d6b..5d6ba8c534713 100644 --- a/stdlib/public/core/Zip.swift +++ b/stdlib/public/core/Zip.swift @@ -62,7 +62,7 @@ public struct Zip2Generator< } internal var _baseStreams: (Generator1, Generator2) - internal var _reachedEnd: Bool = false + internal var _reachedEnd = false } /// A sequence of pairs built out of two underlying sequences, where