autoformat and tidy an unnecessary direct db relation use

Author: smowton

go/ql/lib/semmle/go/Types.qll

@@ -1226,30 +1226,20 @@ class ComparableType extends NamedType {
 }
 
 pragma[nomagic]
-private predicate unpackTupleType(TupleType tt, TOptType c0, TOptType c1, TOptType c2, int nComponents) {
+private predicate unpackTupleType(
+  TupleType tt, TOptType c0, TOptType c1, TOptType c2, int nComponents
+) {
   nComponents = count(int i | component_types(tt, i, _, _)) and
-  (
-    if nComponents >= 1
-    then c0 = MkSomeType(tt.getComponentType(0))
-    else c0 = MkNoType()
-  ) and
-  (
-    if nComponents >= 2
-    then c1 = MkSomeType(tt.getComponentType(1))
-    else c1 = MkNoType()
-  ) and
-  (
-    if nComponents >= 3
-    then c2 = MkSomeType(tt.getComponentType(2))
-    else c2 = MkNoType()
-  )
+  (if nComponents >= 1 then c0 = MkSomeType(tt.getComponentType(0)) else c0 = MkNoType()) and
+  (if nComponents >= 2 then c1 = MkSomeType(tt.getComponentType(1)) else c1 = MkNoType()) and
+  (if nComponents >= 3 then c2 = MkSomeType(tt.getComponentType(2)) else c2 = MkNoType())
 }
 
 pragma[nomagic]
-private predicate unpackAndUnaliasTupleType(TupleType tt, TOptType c0, TOptType c1, TOptType c2, int nComponents) {
-  exists(
-    OptType c0a, OptType c1a, OptType c2a
-  |
+private predicate unpackAndUnaliasTupleType(
+  TupleType tt, TOptType c0, TOptType c1, TOptType c2, int nComponents
+) {
+  exists(OptType c0a, OptType c1a, OptType c2a |
     unpackTupleType(tt, c0a, c1a, c2a, nComponents) and
     c0 = c0a.getDeepUnaliasedType() and
     c1 = c1a.getDeepUnaliasedType() and
@@ -1263,9 +1253,7 @@ class TupleType extends @tupletype, CompositeType {
   Type getComponentType(int i) { component_types(this, i, _, result) }
 
   private TupleType getCandidateDeepUnaliasedType() {
-    exists(
-      OptType c0, OptType c1, OptType c2, int nComponents
-    |
+    exists(OptType c0, OptType c1, OptType c2, int nComponents |
       unpackAndUnaliasTupleType(this, c0, c1, c2, nComponents) and
       unpackTupleType(result, c0, c1, c2, nComponents)
     )
@@ -1279,9 +1267,7 @@ class TupleType extends @tupletype, CompositeType {
       or
       this.isDeepUnaliasedTypeUpTo(tt, i - 1)
     ) and
-    exists(Type tp | component_types(this, i, _, tp) |
-      component_types(tt, i, _, tp.getDeepUnaliasedType())
-    )
+    tt.getComponentType(i) = this.getComponentType(i).getDeepUnaliasedType()
   }
 
   override TupleType getDeepUnaliasedType() {