Rust: Move the restriction to variableDecl.

Author: geoffw0

rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll

@@ -77,21 +77,20 @@ module Impl {
       not exists(getOutermostEnclosingOrPat(p)) and
       definingNode = p.getName()
     ) and
-    name = p.getName().getText()
+    name = p.getName().getText() and
+    // exclude for now anything starting with an uppercase character, which may be a reference to
+    // an enum constant (e.g. `None`). This excludes static and constant variables (UPPERCASE),
+    // which we don't appear to recognize yet anyway. This also assumes programmers follow the
+    // naming guidelines, which they generally do, but they're not enforced.
+    not name.charAt(0).isUppercase()
   }
 
   /** A variable. */
   class Variable extends MkVariable {
     private AstNode definingNode;
     private string name;
 
-    Variable() {
-      this = MkVariable(definingNode, name) and
-      // exclude for now anything starting with an uppercase character, which may be an enum constant (e.g. `None`). This excludes
-      // static and constant variables (UPPERCASE), which we don't appear to recognize yet anyway. This also assumes programmers
-      // follow the naming guidelines, which they generally do, but they're not enforced.
-      not name.charAt(0).isUppercase()
-    }
+    Variable() { this = MkVariable(definingNode, name) }
 
     /** Gets the name of this variable. */
     string getName() { result = name }