Skip to content

Commit fa8e2a3

Browse files
committed
run swiftformat
1 parent f21e583 commit fa8e2a3

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

Sources/Commands/PackageCommands/AddDependency.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,24 @@ extension SwiftPackageCommand {
6666
throw StringError("unknown package")
6767
}
6868

69-
switch type {
69+
switch self.type {
7070
case .url:
7171
try self.createSourceControlPackage(
7272
packagePath: packagePath,
7373
workspace: workspace,
74-
url: dependency
74+
url: self.dependency
7575
)
7676
case .path:
7777
try self.createFileSystemPackage(
7878
packagePath: packagePath,
7979
workspace: workspace,
80-
directory: dependency
80+
directory: self.dependency
8181
)
8282
case .registry:
8383
try self.createRegistryPackage(
8484
packagePath: packagePath,
8585
workspace: workspace,
86-
id: dependency
86+
id: self.dependency
8787
)
8888
}
8989
}
@@ -143,12 +143,12 @@ extension SwiftPackageCommand {
143143
}
144144

145145
let packageDependency: PackageDescription.Package.Dependency = .package(
146-
url: dependency,
146+
url: self.dependency,
147147
requirement: requirement,
148148
traits: []
149149
)
150150

151-
try applyEdits(
151+
try self.applyEdits(
152152
packagePath: packagePath,
153153
workspace: workspace,
154154
packageDependency: packageDependency
@@ -202,7 +202,7 @@ extension SwiftPackageCommand {
202202
}
203203

204204
let packageDependency: PackageDescription.Package.Dependency = .package(
205-
id: dependency,
205+
id: self.dependency,
206206
requirement: requirement,
207207
traits: []
208208
)

Sources/CoreCommands/Options.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
import ArgumentParser
1414

15-
import var Basics.localFileSystem
1615
import struct Basics.AbsolutePath
16+
import var Basics.localFileSystem
1717
import enum Basics.TestingLibrary
1818
import struct Basics.Triple
1919

@@ -22,8 +22,8 @@ import struct Foundation.URL
2222
import enum PackageModel.BuildConfiguration
2323
import struct PackageModel.BuildFlags
2424
import struct PackageModel.EnabledSanitizers
25-
import struct PackageModel.PackageIdentity
2625
import class PackageModel.Manifest
26+
import struct PackageModel.PackageIdentity
2727
import enum PackageModel.Sanitizer
2828
@_spi(SwiftPMInternal) import struct PackageModel.SwiftSDK
2929

Sources/PackageDescription/PackageDependency.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
1413
extension Package {
1514
/// A package dependency of a Swift package.
1615
///
@@ -161,7 +160,7 @@ extension Package {
161160
traits: traits
162161
)
163162
}
164-
163+
165164
convenience init(
166165
name: String?,
167166
location: String,
@@ -177,7 +176,7 @@ extension Package {
177176
traits: traits
178177
)
179178
}
180-
179+
181180
convenience init(
182181
id: String,
183182
requirement: RegistryRequirement,

Sources/PackageModelSyntax/AddPackageDependency.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import SwiftSyntax
1818
import SwiftSyntaxBuilder
1919

2020
/// Add a package dependency to a manifest's source code.
21-
public struct AddPackageDependency {
21+
public enum AddPackageDependency {
2222
/// The set of argument labels that can occur after the "dependencies"
2323
/// argument in the Package initializers.
2424
///
@@ -28,7 +28,7 @@ public struct AddPackageDependency {
2828
"targets",
2929
"swiftLanguageVersions",
3030
"cLanguageStandard",
31-
"cxxLanguageStandard"
31+
"cxxLanguageStandard",
3232
]
3333

3434
/// Produce the set of source edits needed to add the given package
@@ -50,7 +50,7 @@ public struct AddPackageDependency {
5050

5151
return PackageEditResult(
5252
manifestEdits: [
53-
.replace(packageCall, with: newPackageCall.description)
53+
.replace(packageCall, with: newPackageCall.description),
5454
]
5555
)
5656
}
@@ -62,7 +62,7 @@ public struct AddPackageDependency {
6262
) throws -> FunctionCallExprSyntax {
6363
try packageCall.appendingToArrayArgument(
6464
label: "dependencies",
65-
trailingLabels: Self.argumentLabelsAfterDependencies,
65+
trailingLabels: self.argumentLabelsAfterDependencies,
6666
newElement: dependency.asSyntax()
6767
)
6868
}

0 commit comments

Comments
 (0)