Rust: fix QL compilation and schema includes ordering

Author: Paolo Tranquilli

misc/codegen/lib/schema.py

@@ -118,7 +118,7 @@ def check_types(self, known: typing.Iterable[str]):
 @dataclass
 class Schema:
     classes: Dict[str, Class] = field(default_factory=dict)
-    includes: Set[str] = field(default_factory=set)
+    includes: List[str] = field(default_factory=list)
     null: Optional[str] = None
 
     @property

misc/codegen/loaders/schemaloader.py

@@ -135,7 +135,7 @@ def load(m: types.ModuleType) -> schema.Schema:
         if hasattr(defs, name):
             continue
         if name == "__includes":
-            includes = set(data)
+            includes = data
             continue
         if name.startswith("__"):
             continue

rust/ql/lib/codeql/IDEContextual.qll

@@ -2,7 +2,7 @@
  * Provides shared predicates related to contextual queries in the code viewer.
  */
 
-private import codeql.rust.elements.File
+import codeql.files.FileSystem
 private import codeql.util.FileSystem
 
 /**

rust/ql/lib/codeql/rust/controlflow/internal/PrintCfg.ql

@@ -7,7 +7,7 @@
  * @tags ide-contextual-queries/print-cfg
  */
 
-private import codeql.rust.elements.File
+private import codeql.files.FileSystem
 private import codeql.rust.controlflow.internal.ControlFlowGraphImpl
 private import codeql.rust.controlflow.ControlFlowGraph
 

rust/ql/lib/codeql/rust/elements/File.qll

@@ -3,7 +3,6 @@
  */
 
 private import codeql.rust.generated.Locatable
-import codeql.files.FileSystem
 import codeql.Locations
 private import codeql.rust.generated.Synth
 private import codeql.rust.generated.Raw

rust/ql/lib/codeql/rust/elements/Locatable.qll

@@ -12,7 +12,7 @@ private int getOrder(PrintAstNode node) {
     |
       n
       order by
-        loc.getFile().getName(), loc.getStartLine(), loc.getStartColumn(), loc.getEndLine(),
+        loc.getFile().getAbsolutePath(), loc.getStartLine(), loc.getStartColumn(), loc.getEndLine(),
         loc.getEndColumn()
     )
 }