Skip to content

Commit 28b274c

Browse files
committed
Observation: Stop using deprecated SwiftSyntax APIs.
Addresses a few warnings about use of `as()`: ``` warning: 'as' is deprecated: This cast will always succeed ```
1 parent 56d337d commit 28b274c

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

lib/Macros/Sources/ObservationMacros/Extensions.swift

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ extension VariableDeclSyntax {
4040
}
4141

4242
func accessorsMatching(_ predicate: (TokenKind) -> Bool) -> [AccessorDeclSyntax] {
43-
let patternBindings = bindings.compactMap { binding in
44-
binding.as(PatternBindingSyntax.self)
45-
}
46-
let accessors: [AccessorDeclListSyntax.Element] = patternBindings.compactMap { patternBinding in
43+
let accessors: [AccessorDeclListSyntax.Element] = bindings.compactMap { patternBinding in
4744
switch patternBinding.accessorBlock?.accessors {
4845
case .accessors(let accessors):
4946
return accessors
@@ -52,11 +49,8 @@ extension VariableDeclSyntax {
5249
}
5350
}.flatMap { $0 }
5451
return accessors.compactMap { accessor in
55-
guard let decl = accessor.as(AccessorDeclSyntax.self) else {
56-
return nil
57-
}
58-
if predicate(decl.accessorSpecifier.tokenKind) {
59-
return decl
52+
if predicate(accessor.accessorSpecifier.tokenKind) {
53+
return accessor
6054
} else {
6155
return nil
6256
}
@@ -211,7 +205,7 @@ extension DeclGroupSyntax {
211205
var memberFunctionStandins: [FunctionDeclSyntax.SignatureStandin] {
212206
var standins = [FunctionDeclSyntax.SignatureStandin]()
213207
for member in memberBlock.members {
214-
if let function = member.as(MemberBlockItemSyntax.self)?.decl.as(FunctionDeclSyntax.self) {
208+
if let function = member.decl.as(FunctionDeclSyntax.self) {
215209
standins.append(function.signatureStandin)
216210
}
217211
}
@@ -220,7 +214,7 @@ extension DeclGroupSyntax {
220214

221215
func hasMemberFunction(equvalentTo other: FunctionDeclSyntax) -> Bool {
222216
for member in memberBlock.members {
223-
if let function = member.as(MemberBlockItemSyntax.self)?.decl.as(FunctionDeclSyntax.self) {
217+
if let function = member.decl.as(FunctionDeclSyntax.self) {
224218
if function.isEquivalent(to: other) {
225219
return true
226220
}
@@ -231,7 +225,7 @@ extension DeclGroupSyntax {
231225

232226
func hasMemberProperty(equivalentTo other: VariableDeclSyntax) -> Bool {
233227
for member in memberBlock.members {
234-
if let variable = member.as(MemberBlockItemSyntax.self)?.decl.as(VariableDeclSyntax.self) {
228+
if let variable = member.decl.as(VariableDeclSyntax.self) {
235229
if variable.isEquivalent(to: other) {
236230
return true
237231
}
@@ -242,7 +236,7 @@ extension DeclGroupSyntax {
242236

243237
var definedVariables: [VariableDeclSyntax] {
244238
memberBlock.members.compactMap { member in
245-
if let variableDecl = member.as(MemberBlockItemSyntax.self)?.decl.as(VariableDeclSyntax.self) {
239+
if let variableDecl = member.decl.as(VariableDeclSyntax.self) {
246240
return variableDecl
247241
}
248242
return nil

0 commit comments

Comments
 (0)