Skip to content

Commit 1e3fa1c

Browse files
committed
Replace array += with append to save on allocations
Replace if with ternary expression
1 parent a5dca08 commit 1e3fa1c

File tree

2 files changed

+20
-22
lines changed

2 files changed

+20
-22
lines changed

Sources/SwiftlyCore/Commands.swift

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ extension SystemCommand {
3030
var args: [String] = []
3131

3232
if let datasource = self.datasource {
33-
args += [datasource]
33+
args.append(datasource)
3434
}
3535

3636
return Configuration(
@@ -65,9 +65,11 @@ extension SystemCommand {
6565
var args = c.arguments.storage.map(\.description) + ["-read"]
6666

6767
if let path = self.path {
68-
args += [path.string] + self.keys
68+
args.append(path.string)
6969
}
7070

71+
args.append(contentsOf: self.keys)
72+
7173
c.arguments = .init(args)
7274

7375
return c
@@ -116,7 +118,7 @@ extension SystemCommand {
116118
func config() -> Configuration {
117119
var args: [String] = []
118120

119-
args += self.inputFiles.map(\.string)
121+
args.append(contentsOf: self.inputFiles.map(\.string))
120122

121123
return Configuration(
122124
executable: self.executable,
@@ -205,11 +207,11 @@ extension SystemCommand {
205207
var args: [String] = []
206208

207209
for option in self.options {
208-
args += option.args()
210+
args.append(contentsOf: option.args())
209211
}
210212

211-
args += ["--root", "\(self.root)"]
212-
args += ["\(self.packageOutputPath)"]
213+
args.append(contentsOf: ["--root", "\(self.root)"])
214+
args.append("\(self.packageOutputPath)")
213215

214216
return Configuration(
215217
executable: self.executable,
@@ -255,8 +257,8 @@ extension SystemCommand {
255257
public func config() -> Configuration {
256258
var args: [String] = []
257259

258-
args += [self.database]
259-
args += self.keys
260+
args.append(self.database)
261+
args.append(contentsOf: self.keys)
260262

261263
return Configuration(
262264
executable: self.executable,
@@ -301,7 +303,7 @@ extension SystemCommand {
301303
var args: [String] = []
302304

303305
if let workingDir {
304-
args += ["-C", "\(workingDir)"]
306+
args.append(contentsOf: ["-C", "\(workingDir)"])
305307
}
306308

307309
return Configuration(
@@ -327,7 +329,7 @@ extension SystemCommand {
327329

328330
var args = c.arguments.storage.map(\.description)
329331

330-
args += ["init"]
332+
args.append("init")
331333

332334
c.arguments = .init(args)
333335

@@ -375,9 +377,9 @@ extension SystemCommand {
375377

376378
var args = c.arguments.storage.map(\.description)
377379

378-
args += ["commit"]
380+
args.append("commit")
379381
for option in self.options {
380-
args += option.args()
382+
args.append(contentsOf: option.args())
381383
}
382384

383385
c.arguments = .init(args)
@@ -418,10 +420,10 @@ extension SystemCommand {
418420

419421
var args = c.arguments.storage.map(\.description)
420422

421-
args += ["log"]
423+
args.append("log")
422424

423425
for opt in self.options {
424-
args += opt.args()
426+
args.append(contentsOf: opt.args())
425427
}
426428

427429
c.arguments = .init(args)
@@ -461,14 +463,14 @@ extension SystemCommand {
461463

462464
var args = c.arguments.storage.map(\.description)
463465

464-
args += ["diff-index"]
466+
args.append("diff-index")
465467

466468
for opt in self.options {
467-
args += opt.args()
469+
args.append(contentsOf: opt.args())
468470
}
469471

470472
if let treeIsh = self.treeIsh {
471-
args += [treeIsh]
473+
args.append(treeIsh)
472474
}
473475

474476
c.arguments = .init(args)

Sources/SwiftlyCore/ModeledCommandLine.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,7 @@ extension Executable: CustomStringConvertible {
136136
extension Arguments: CustomStringConvertible {
137137
public var description: String {
138138
let normalized: [String] = self.storage.map(\.description).map {
139-
if $0.contains(" ") {
140-
return "\"\($0)\""
141-
} else {
142-
return String($0)
143-
}
139+
$0.contains(" ") ? "\"\($0)\"" : String($0)
144140
}
145141

146142
return normalized.joined(separator: " ")

0 commit comments

Comments
 (0)