Skip to content

Commit ae9ddae

Browse files
committed
Remove unnecessary variable and matching
1 parent 5381aaa commit ae9ddae

1 file changed

Lines changed: 4 additions & 10 deletions

File tree

shared/src/main/scala/io/kaitai/struct/precompile/ResolveTypes.scala

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,13 @@ class ResolveTypes(specs: ClassSpecs, topClass: ClassSpec, opaqueTypes: Boolean)
8686
}
8787

8888
private def resolveUserType(curClass: ClassSpec, typeName: List[String], path: List[String]): (Option[ClassSpec], Option[CompilationProblem]) = {
89-
val res = try {
89+
try {
9090
val resolver = new ClassTypeProvider(specs, curClass)
91-
Some(resolver.resolveTypePath(curClass, typeName))
91+
val ty = resolver.resolveTypePath(curClass, typeName)
92+
Log.typeResolve.info(() => s" => ${ty.nameAsStr}")
93+
(Some(ty), None)
9294
} catch {
9395
case _: TypeNotFoundError =>
94-
None
95-
}
96-
97-
res match {
98-
case None =>
9996
// Type definition not found
10097
if (opaqueTypes) {
10198
// Generate special "opaque placeholder" ClassSpec
@@ -106,9 +103,6 @@ class ResolveTypes(specs: ClassSpecs, topClass: ClassSpec, opaqueTypes: Boolean)
106103
Log.typeResolve.info(() => " => ??? (opaque type are disabled => error)")
107104
(None, Some(TypeNotFoundErr(typeName, curClass, path)))
108105
}
109-
case Some(x) =>
110-
Log.typeResolve.info(() => s" => ${x.nameAsStr}")
111-
(res, None)
112106
}
113107
}
114108
}

0 commit comments

Comments
 (0)