Rust: first draft of canonical paths rework (WIP)

misc/codegen/generators/rustgen.py

@@ -101,38 +101,27 @@ def _get_class(self, name: str) -> rust.Class:
         )
 
     def get_classes(self):
-        ret = {"": []}
+        ret = []
         for k, cls in self._classmap.items():
             if not cls.imported and not cls.synth:
-                ret.setdefault(cls.group, []).append(self._get_class(cls.name))
+                ret.append(self._get_class(cls.name))
             elif cls.imported:
-                ret[""].append(rust.Class(name=cls.name))
+                ret.append(rust.Class(name=cls.name))
         return ret
 
 
 def generate(opts, renderer):
     assert opts.rust_output
     processor = Processor(schemaloader.load_file(opts.schema))
     out = opts.rust_output
-    groups = set()
     with renderer.manage(generated=out.rglob("*.rs"),
                          stubs=(),
                          registry=out / ".generated.list",
                          force=opts.force) as renderer:
-        for group, classes in processor.get_classes().items():
-            group = group or "top"
-            groups.add(group)
-            renderer.render(
-                rust.ClassList(
-                    classes,
-                    opts.schema,
-                ),
-                out / f"{group}.rs",
-            )
         renderer.render(
-            rust.ModuleList(
-                groups,
-                opts.schema,
+            rust.ClassList(
+                classes=processor.get_classes(),
+                source=opts.schema,
             ),
             out / f"mod.rs",
         )

misc/codegen/loaders/schemaloader.py

@@ -121,9 +121,14 @@ def _fill_hideable_information(classes: typing.Dict[str, schema.Class]):
 
 
 def _check_test_with(classes: typing.Dict[str, schema.Class]):
+    pragma = "qltest_test_with"
     for cls in classes.values():
-        test_with = typing.cast(str, cls.pragmas.get("qltest_test_with"))
-        transitive_test_with = test_with and classes[test_with].pragmas.get("qltest_test_with")
+        if cls.name == cls.pragmas.get(pragma):
+            # this is already implicit
+            del cls.pragmas[pragma]
+    for cls in classes.values():
+        test_with = typing.cast(str, cls.pragmas.get(pragma))
+        transitive_test_with = test_with and classes[test_with].pragmas.get(pragma)
         if test_with and transitive_test_with:
             raise schema.Error(f"{cls.name} has test_with {test_with} which in turn "
                                f"has test_with {transitive_test_with}, use that directly")

rust/ast-generator/src/main.rs

@@ -456,7 +456,7 @@ fn write_extractor(grammar: &AstSrc) -> std::io::Result<String> {
 
 use super::base::Translator;
 use super::mappings::TextValue;
-use crate::emit_detached;
+use crate::{{emit_detached,emit_canonical_origin}};
 use crate::generated;
 use crate::trap::{{Label, TrapId}};
 use ra_ap_syntax::ast::{{