move

Author: hvitved

rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll

@@ -3289,6 +3289,51 @@ private Type getTupleFieldExprLookupType(FieldExpr fe, int pos, DerefChain deref
   )
 }
 
+/** Gets the root type of the reference expression `ref`. */
+pragma[nomagic]
+private Type inferRefExprType(RefExpr ref) {
+  if ref.isRaw()
+  then
+    ref.isMut() and result instanceof PtrMutType
+    or
+    ref.isConst() and result instanceof PtrConstType
+  else
+    if ref.isMut()
+    then result instanceof RefMutType
+    else result instanceof RefSharedType
+}
+
+/** Gets the root type of the reference node `ref`. */
+pragma[nomagic]
+private Type inferRefPatType(AstNode ref) {
+  exists(boolean isMut |
+    ref =
+      any(IdentPat ip |
+        ip.isRef() and
+        if ip.isMut() then isMut = true else isMut = false
+      ).getName()
+    or
+    ref = any(RefPat rp | if rp.isMut() then isMut = true else isMut = false)
+  |
+    result = getRefType(isMut)
+  )
+}
+
+pragma[nomagic]
+private Type inferTryExprType(TryExpr te, TypePath path) {
+  exists(TypeParam tp, TypePath path0 |
+    result = inferType(te.getExpr(), path0) and
+    path0.isCons(TTypeParamTypeParameter(tp), path)
+  |
+    tp = any(ResultEnum r).getGenericParamList().getGenericParam(0)
+    or
+    tp = any(OptionEnum o).getGenericParamList().getGenericParam(0)
+  )
+}
+
+pragma[nomagic]
+private StructType getStrStruct() { result = TDataType(any(Builtins::Str s)) }
+
 /**
  * A matching configuration for resolving types of field expressions like `x.field`.
  */
@@ -3441,51 +3486,6 @@ private Type inferFieldExprType(AstNode n, TypePath path) {
   )
 }
 
-/** Gets the root type of the reference expression `ref`. */
-pragma[nomagic]
-private Type inferRefExprType(RefExpr ref) {
-  if ref.isRaw()
-  then
-    ref.isMut() and result instanceof PtrMutType
-    or
-    ref.isConst() and result instanceof PtrConstType
-  else
-    if ref.isMut()
-    then result instanceof RefMutType
-    else result instanceof RefSharedType
-}
-
-/** Gets the root type of the reference node `ref`. */
-pragma[nomagic]
-private Type inferRefPatType(AstNode ref) {
-  exists(boolean isMut |
-    ref =
-      any(IdentPat ip |
-        ip.isRef() and
-        if ip.isMut() then isMut = true else isMut = false
-      ).getName()
-    or
-    ref = any(RefPat rp | if rp.isMut() then isMut = true else isMut = false)
-  |
-    result = getRefType(isMut)
-  )
-}
-
-pragma[nomagic]
-private Type inferTryExprType(TryExpr te, TypePath path) {
-  exists(TypeParam tp, TypePath path0 |
-    result = inferType(te.getExpr(), path0) and
-    path0.isCons(TTypeParamTypeParameter(tp), path)
-  |
-    tp = any(ResultEnum r).getGenericParamList().getGenericParam(0)
-    or
-    tp = any(OptionEnum o).getGenericParamList().getGenericParam(0)
-  )
-}
-
-pragma[nomagic]
-private StructType getStrStruct() { result = TDataType(any(Builtins::Str s)) }
-
 pragma[nomagic]
 private Type inferLiteralType(LiteralExpr le, TypePath path, boolean certain) {
   path.isEmpty() and