Ruby: Get rid of competing module declaration

Author: aschackmull

ruby/ql/lib/codeql/ruby/security/UnsafeShellCommandConstructionCustomizations.qll

@@ -111,13 +111,10 @@ module UnsafeShellCommandConstruction {
       isUsedAsShellCommand(call, s) and
       (
         this = call.getReceiver() and
-        not call.getReceiver().asExpr() instanceof Cfg::CfgNodes::ExprNodes::ArrayLiteralCfgNode
+        not call.getReceiver().asExpr() instanceof CfgNodes::ExprNodes::ArrayLiteralCfgNode
         or
         this.asExpr() =
-          call.getReceiver()
-              .asExpr()
-              .(Cfg::CfgNodes::ExprNodes::ArrayLiteralCfgNode)
-              .getAnArgument()
+          call.getReceiver().asExpr().(CfgNodes::ExprNodes::ArrayLiteralCfgNode).getAnArgument()
       )
     }
 

ruby/ql/lib/codeql/ruby/security/WeakSensitiveDataHashingCustomizations.qll

@@ -69,7 +69,7 @@ private module SensitiveDataSources {
    */
   class SensitiveHashValueAccess extends SensitiveDataSource::Range instanceof SensitiveNode {
     SensitiveHashValueAccess() {
-      this.asExpr() instanceof Cfg::CfgNodes::ExprNodes::ElementReferenceCfgNode
+      this.asExpr() instanceof CfgNodes::ExprNodes::ElementReferenceCfgNode
     }
 
     override SensitiveDataClassification getClassification() {

ruby/ql/lib/ruby.qll

@@ -3,5 +3,5 @@
  */
 
 import codeql.ruby.AST as Ast
-import codeql.ruby.CFG as Cfg
+import codeql.ruby.CFG
 import codeql.ruby.DataFlow // already defines its own wrapper module