Skip to content

Commit 89c2854

Browse files
DougGregorxedin
authored andcommitted
Remove more uses of switch expressions
1 parent 1aa14e6 commit 89c2854

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

Sources/SwiftRefactor/PackageManifest/PackageDependency.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ extension PackageDependency.SourceControl: ManifestSyntaxRepresentable {
8989
case .local:
9090
fatalError()
9191
case .remote(let url):
92-
".package(url: \(literal: url.description), \(requirement.asSyntax()))"
92+
return ".package(url: \(literal: url.description), \(requirement.asSyntax()))"
9393
}
9494
}
9595
}
@@ -104,30 +104,30 @@ extension PackageDependency.SourceControl.Requirement: ManifestSyntaxRepresentab
104104
func asSyntax() -> LabeledExprSyntax {
105105
switch self {
106106
case .exact(let version):
107-
LabeledExprSyntax(
107+
return LabeledExprSyntax(
108108
label: "exact",
109109
expression: version.asSyntax()
110110
)
111111

112112
case .rangeFrom(let range):
113-
LabeledExprSyntax(
113+
return LabeledExprSyntax(
114114
label: "from",
115115
expression: range.asSyntax()
116116
)
117117

118118
case .range(let lowerBound, let upperBound):
119-
LabeledExprSyntax(
119+
return LabeledExprSyntax(
120120
expression: "\(lowerBound.asSyntax())..<\(upperBound.asSyntax())" as ExprSyntax
121121
)
122122

123123
case .revision(let revision):
124-
LabeledExprSyntax(
124+
return LabeledExprSyntax(
125125
label: "revision",
126126
expression: "\(literal: revision)" as ExprSyntax
127127
)
128128

129129
case .branch(let branch):
130-
LabeledExprSyntax(
130+
return LabeledExprSyntax(
131131
label: "branch",
132132
expression: "\(literal: branch)" as ExprSyntax
133133
)
@@ -139,19 +139,19 @@ extension PackageDependency.Registry.Requirement: ManifestSyntaxRepresentable {
139139
func asSyntax() -> LabeledExprSyntax {
140140
switch self {
141141
case .exact(let version):
142-
LabeledExprSyntax(
142+
return LabeledExprSyntax(
143143
label: "exact",
144144
expression: version.asSyntax()
145145
)
146146

147147
case .rangeFrom(let range):
148-
LabeledExprSyntax(
148+
return LabeledExprSyntax(
149149
label: "from",
150150
expression: range.asSyntax()
151151
)
152152

153153
case .range(let lowerBound, let upperBound):
154-
LabeledExprSyntax(
154+
return LabeledExprSyntax(
155155
expression: "\(lowerBound.asSyntax())..<\(upperBound.asSyntax())" as ExprSyntax
156156
)
157157
}

Sources/SwiftRefactor/PackageManifest/TargetDescription.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,16 @@ extension TargetDescription.Dependency: ManifestSyntaxRepresentable {
115115
func asSyntax() -> ExprSyntax {
116116
switch self {
117117
case .byName(name: let name):
118-
"\(literal: name)"
118+
return "\(literal: name)"
119119

120120
case .target(name: let name):
121-
".target(name: \(literal: name))"
121+
return ".target(name: \(literal: name))"
122122

123123
case .product(name: let name, package: nil):
124-
".product(name: \(literal: name))"
124+
return ".product(name: \(literal: name))"
125125

126126
case .product(name: let name, package: let package):
127-
".product(name: \(literal: name), package: \(literal: package))"
127+
return ".product(name: \(literal: name), package: \(literal: package))"
128128
}
129129
}
130130
}
@@ -133,10 +133,10 @@ extension TargetDescription.PluginUsage: ManifestSyntaxRepresentable {
133133
func asSyntax() -> ExprSyntax {
134134
switch self {
135135
case .plugin(name: let name, package: nil):
136-
".plugin(name: \(literal: name))"
136+
return ".plugin(name: \(literal: name))"
137137

138138
case .plugin(name: let name, package: let package):
139-
".plugin(name: \(literal: name), package: \(literal: package))"
139+
return ".plugin(name: \(literal: name), package: \(literal: package))"
140140
}
141141
}
142142
}

0 commit comments

Comments
 (0)