Skip to content

Commit 778c0d6

Browse files
committed
Remove unnecessary variable and matching
1 parent 056a02b commit 778c0d6

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
@@ -79,16 +79,13 @@ class ResolveTypes(specs: ClassSpecs, topClass: ClassSpec, opaqueTypes: Boolean)
7979
}
8080

8181
private def resolveUserType(curClass: ClassSpec, typeName: List[String], path: List[String]): (Option[ClassSpec], Option[CompilationProblem]) = {
82-
val res = try {
82+
try {
8383
val resolver = new ClassTypeProvider(specs, curClass)
84-
Some(resolver.resolveTypePath(curClass, typeName))
84+
val ty = resolver.resolveTypePath(curClass, typeName)
85+
Log.typeResolve.info(() => s" => ${ty.nameAsStr}")
86+
(Some(ty), None)
8587
} catch {
8688
case _: TypeNotFoundError =>
87-
None
88-
}
89-
90-
res match {
91-
case None =>
9289
// Type definition not found
9390
if (opaqueTypes) {
9491
// Generate special "opaque placeholder" ClassSpec
@@ -99,9 +96,6 @@ class ResolveTypes(specs: ClassSpecs, topClass: ClassSpec, opaqueTypes: Boolean)
9996
Log.typeResolve.info(() => " => ??? (opaque type are disabled => error)")
10097
(None, Some(TypeNotFoundErr(typeName, curClass, path)))
10198
}
102-
case Some(x) =>
103-
Log.typeResolve.info(() => s" => ${x.nameAsStr}")
104-
(res, None)
10599
}
106100
}
107101
}

0 commit comments

Comments
 (0)