Skip to content

Commit b2159ac

Browse files
committed
Update plutil sources for Swift 3 naming changes.
1 parent df239bb commit b2159ac

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Diff for: Tools/plutil/main.swift

+8-8
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ struct Options {
5959
var inputs = [String]()
6060
}
6161

62-
enum OptionParseError : ErrorType {
62+
enum OptionParseError : ErrorProtocol {
6363
case UnrecognizedArgument(String)
6464
case MissingArgument(String)
6565
case InvalidFormat(String)
6666
}
6767

6868
func parseArguments(_ args: [String]) throws -> Options {
6969
var opts = Options()
70-
var iterator = args.generate()
70+
var iterator = args.makeIterator()
7171
while let arg = iterator.next() {
7272
switch arg {
7373
case "--":
@@ -201,7 +201,7 @@ enum DisplayType {
201201

202202
extension Dictionary {
203203
func display(_ indent: Int = 0, type: DisplayType = .Primary) {
204-
let indentation = String(count: indent * 2, repeatedValue: Character(" "))
204+
let indentation = String(repeating: Character(" "), count: indent * 2)
205205
if type == .Primary || type == .Key {
206206
print("\(indentation)[\n", terminator: "")
207207
} else {
@@ -224,7 +224,7 @@ extension Dictionary {
224224

225225
extension Array {
226226
func display(_ indent: Int = 0, type: DisplayType = .Primary) {
227-
let indentation = String(count: indent * 2, repeatedValue: Character(" "))
227+
let indentation = String(repeating: Character(" "), count: indent * 2)
228228
if type == .Primary || type == .Key {
229229
print("\(indentation)[\n", terminator: "")
230230
} else {
@@ -242,7 +242,7 @@ extension Array {
242242

243243
extension String {
244244
func display(_ indent: Int = 0, type: DisplayType = .Primary) {
245-
let indentation = String(count: indent * 2, repeatedValue: Character(" "))
245+
let indentation = String(repeating: Character(" "), count: indent * 2)
246246
if type == .Primary {
247247
print("\(indentation)\"\(self)\"\n", terminator: "")
248248
}
@@ -256,7 +256,7 @@ extension String {
256256

257257
extension Bool {
258258
func display(_ indent: Int = 0, type: DisplayType = .Primary) {
259-
let indentation = String(count: indent * 2, repeatedValue: Character(" "))
259+
let indentation = String(repeating: Character(" "), count: indent * 2)
260260
if type == .Primary {
261261
print("\(indentation)\"\(self ? "1" : "0")\"\n", terminator: "")
262262
}
@@ -270,7 +270,7 @@ extension Bool {
270270

271271
extension NSNumber {
272272
func display(_ indent: Int = 0, type: DisplayType = .Primary) {
273-
let indentation = String(count: indent * 2, repeatedValue: Character(" "))
273+
let indentation = String(repeating: Character(" "), count: indent * 2)
274274
if type == .Primary {
275275
print("\(indentation)\"\(self)\"\n", terminator: "")
276276
}
@@ -284,7 +284,7 @@ extension NSNumber {
284284

285285
extension NSData {
286286
func display(_ indent: Int = 0, type: DisplayType = .Primary) {
287-
let indentation = String(count: indent * 2, repeatedValue: Character(" "))
287+
let indentation = String(repeating: Character(" "), count: indent * 2)
288288
if type == .Primary {
289289
print("\(indentation)\"\(self)\"\n", terminator: "")
290290
}

0 commit comments

Comments
 (0)