Fix merge conflicts during rebase

Author: aibaars

.github/workflows/build.yml

@@ -47,7 +47,7 @@ jobs:
         run: cargo build --release
       - name: Generate dbscheme
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: target/release/ruby-generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql_ruby/ast/internal/TreeSitter.qll
+        run: target/release/ruby-generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
       - uses: actions/upload-artifact@v2
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
@@ -57,7 +57,7 @@ jobs:
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
           name: TreeSitter.qll
-          path: ql/lib/codeql_ruby/ast/internal/TreeSitter.qll
+          path: ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
       - uses: actions/upload-artifact@v2
         with:
           name: extractor-${{ matrix.os }}

Makefile

@@ -45,8 +45,8 @@ target/release/%$(EXE):
 
 dbscheme:
 	cargo build --bin ruby-generator
-	cargo run -p ruby-generator -- --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql_ruby/ast/internal/TreeSitter.qll
-	codeql query format -i ql/lib/codeql_ruby/ast/internal/TreeSitter.qll
+	cargo run -p ruby-generator -- --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
+	codeql query format -i ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
 
 .PHONY:	extractor
 extractor:	$(FILES) $(BIN_FILES)

README.md

@@ -1,5 +1,5 @@
-import codeql_ruby.AST
-import codeql_ruby.ast.internal.Synthesis
+import codeql.ruby.AST
+import codeql.ruby.ast.internal.Synthesis
 
 private string getAPrimaryQlClass(AstNode node) {
   result = node.getAPrimaryQlClass()

ql/consistency-queries/AstConsistency.ql

@@ -1 +1 @@
-import codeql_ruby.controlflow.internal.Consistency
+import codeql.ruby.controlflow.internal.Consistency

ql/consistency-queries/CfgConsistency.ql

@@ -1 +1 @@
-import codeql_ruby.dataflow.internal.DataFlowImplConsistency::Consistency
+import codeql.ruby.dataflow.internal.DataFlowImplConsistency::Consistency

ql/consistency-queries/DataFlowConsistency.ql

@@ -1,6 +1,6 @@
 import ruby
-import codeql_ruby.dataflow.SSA
-import codeql_ruby.controlflow.ControlFlowGraph
+import codeql.ruby.dataflow.SSA
+import codeql.ruby.controlflow.ControlFlowGraph
 
 query predicate nonUniqueDef(CfgNode read, Ssa::Definition def) {
   read = def.getARead() and

ql/consistency-queries/SsaConsistency.ql

@@ -1,4 +1,4 @@
-import codeql_ruby.ast.Variable
+import codeql.ruby.ast.Variable
 
 query predicate ambiguousVariable(VariableAccess access, Variable variable) {
   access.getVariable() = variable and

ql/consistency-queries/VariablesConsistency.ql

@@ -7,10 +7,10 @@
  */
 
 private import ruby
-import codeql_ruby.DataFlow
-import codeql_ruby.typetracking.TypeTracker
-import codeql_ruby.ast.internal.Module
-private import codeql_ruby.controlflow.CfgNodes
+import codeql.ruby.DataFlow
+import codeql.ruby.typetracking.TypeTracker
+import codeql.ruby.ast.internal.Module
+private import codeql.ruby.controlflow.CfgNodes
 
 /**
  * Provides classes and predicates for working with APIs used in a database.