Merge pull request #18611 from github/aibaars/use-tree-star

Rust: add UseTree::is_star

rust/ast-generator/src/main.rs

@@ -38,6 +38,7 @@ fn property_name(type_name: &str, field_name: &str) -> String {
         (_, "else_branch") => "else_",
         ("ArrayType", "ty") => "element_type_repr",
         ("SelfParam", "is_amp") => "is_ref",
+        ("UseTree", "is_star") => "is_glob",
         (_, "ty") => "type_repr",
         _ => field_name,
     };
@@ -363,6 +364,12 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
                 ty: FieldType::Predicate,
             });
         }
+        "UseTree" => {
+            result.push(FieldInfo {
+                name: "is_star".to_string(),
+                ty: FieldType::Predicate,
+            });
+        }
         _ => {}
     }
 

rust/ql/lib/rust.dbscheme

@@ -1094,6 +1094,11 @@ use_trees(
   unique int id: @use_tree
 );
 
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
 #keyset[id]
 use_tree_paths(
   int id: @use_tree ref,

rust/ql/test/extractor-tests/generated/UseTree/UseTree.expected

@@ -0,0 +1,7 @@
+| gen_use_tree.rs:5:9:5:33 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
+| gen_use_tree.rs:6:9:6:27 | UseTree | isGlob: | yes | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
+| gen_use_tree.rs:7:9:7:46 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | yes | hasUseTreeList: | no |
+| gen_use_tree.rs:8:9:8:50 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | yes |
+| gen_use_tree.rs:8:28:8:31 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
+| gen_use_tree.rs:8:34:8:40 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |
+| gen_use_tree.rs:8:43:8:49 | UseTree | isGlob: | no | hasPath: | yes | hasRename: | no | hasUseTreeList: | no |

rust/ql/test/extractor-tests/generated/UseTree/UseTree_getPath.expected

@@ -0,0 +1,7 @@
+| gen_use_tree.rs:5:9:5:33 | UseTree | gen_use_tree.rs:5:9:5:33 | ...::HashMap |
+| gen_use_tree.rs:6:9:6:27 | UseTree | gen_use_tree.rs:6:9:6:24 | ...::collections |
+| gen_use_tree.rs:7:9:7:46 | UseTree | gen_use_tree.rs:7:9:7:33 | ...::HashMap |
+| gen_use_tree.rs:8:9:8:50 | UseTree | gen_use_tree.rs:8:9:8:24 | ...::collections |
+| gen_use_tree.rs:8:28:8:31 | UseTree | gen_use_tree.rs:8:28:8:31 | self |
+| gen_use_tree.rs:8:34:8:40 | UseTree | gen_use_tree.rs:8:34:8:40 | HashMap |
+| gen_use_tree.rs:8:43:8:49 | UseTree | gen_use_tree.rs:8:43:8:49 | HashSet |

rust/ql/test/extractor-tests/generated/UseTree/UseTree_getRename.expected

@@ -0,0 +1 @@
+| gen_use_tree.rs:7:9:7:46 | UseTree | gen_use_tree.rs:7:35:7:46 | Rename |

rust/ql/test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.expected

@@ -0,0 +1 @@
+| gen_use_tree.rs:8:9:8:50 | UseTree | gen_use_tree.rs:8:27:8:50 | UseTreeList |