Rust/Codegen: fix generated list files

Author: Paolo Tranquilli

misc/codegen/generators/qlgen.py

@@ -26,6 +26,7 @@
 import subprocess
 import typing
 import itertools
+import os
 
 import inflection
 
@@ -370,8 +371,10 @@ def generate(opts, renderer):
 
     imports = {}
     generated_import_prefix = get_import(out, opts.root_dir)
+    registry = opts.generated_registry or pathlib.Path(
+        os.path.commonpath((out, stub_out, test_out)), ".generated.list")
 
-    with renderer.manage(generated=generated, stubs=stubs, registry=opts.generated_registry,
+    with renderer.manage(generated=generated, stubs=stubs, registry=registry,
                          force=opts.force) as renderer:
 
         db_classes = [cls for name, cls in classes.items() if not data.classes[name].synth]

misc/codegen/generators/rustgen.py

@@ -88,7 +88,7 @@ def generate(opts, renderer):
     groups = set()
     with renderer.manage(generated=out.rglob("*.rs"),
                          stubs=(),
-                         registry=opts.generated_registry,
+                         registry=out / ".generated.list",
                          force=opts.force) as renderer:
         for group, classes in processor.get_classes().items():
             group = group or "top"

misc/codegen/generators/rusttestgen.py

@@ -32,7 +32,7 @@ def generate(opts, renderer):
     schema = schemaloader.load_file(opts.schema)
     with renderer.manage(generated=opts.ql_test_output.rglob("gen_*.rs"),
                          stubs=(),
-                         registry=opts.generated_registry,
+                         registry=opts.ql_test_output / ".generated_tests.list",
                          force=opts.force) as renderer:
         for cls in schema.classes.values():
             if (qlgen.should_skip_qltest(cls, schema.classes) or

rust/.generated.list

@@ -5,5 +5,4 @@
 --ql-stub-output=ql/lib/codeql/rust/elements
 --ql-test-output=ql/test/extractor-tests/generated
 --rust-output=extractor/src/generated
---generated-registry=.generated.list
 --script-name=codegen