diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 4535e0be4c1c8..177651bf1ca80 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -61,6 +61,10 @@ import CfgImpl
 /** Holds if `p` is a trivial pattern that is always guaranteed to match. */
 predicate trivialPat(Pat p) { p instanceof WildcardPat or p instanceof IdentPat }
 
+class ArrayExprTree extends StandardPostOrderTree, ArrayExpr {
+  override AstNode getChildNode(int i) { result = this.getExpr(i) }
+}
+
 class AsmExprTree extends LeafTree instanceof AsmExpr { }
 
 class AwaitExprTree extends StandardPostOrderTree instanceof AwaitExpr {
@@ -392,6 +396,9 @@ class ForExprTree extends LoopingExprTree instanceof ForExpr {
   }
 }
 
+// TODO: replace with expanded macro once the extractor supports it
+class MacroExprTree extends LeafTree, MacroExpr { }
+
 class MatchArmTree extends ControlFlowTree instanceof MatchArm {
   override predicate propagatesAbnormal(AstNode child) { child = super.getExpr() }
 
@@ -452,6 +459,10 @@ class MethodCallExprTree extends StandardPostOrderTree instanceof MethodCallExpr
   }
 }
 
+class NameTree extends LeafTree, Name { }
+
+class NameRefTree extends LeafTree, NameRef { }
+
 class OffsetOfExprTree extends LeafTree instanceof OffsetOfExpr { }
 
 class ParenExprTree extends StandardPostOrderTree, ParenExpr {
@@ -461,6 +472,18 @@ class ParenExprTree extends StandardPostOrderTree, ParenExpr {
 // This covers all patterns as they all extend `Pat`
 class PatExprTree extends LeafTree instanceof Pat { }
 
+class PathTree extends StandardPostOrderTree, Path {
+  override AstNode getChildNode(int i) {
+    i = 0 and result = this.getQualifier()
+    or
+    i = 1 and result = this.getPart()
+  }
+}
+
+class PathSegmentTree extends StandardPostOrderTree, PathSegment {
+  override AstNode getChildNode(int i) { i = 0 and result = this.getNameRef() }
+}
+
 class PathExprTree extends LeafTree instanceof PathExpr { }
 
 class PrefixExprTree extends StandardPostOrderTree instanceof PrefixExpr {
@@ -499,6 +522,14 @@ class ReturnExprTree extends PostOrderTree instanceof ReturnExpr {
   }
 }
 
+class StaticTree extends StandardPostOrderTree, Static {
+  override AstNode getChildNode(int i) {
+    i = 0 and result = this.getName()
+    or
+    i = 1 and result = this.getBody()
+  }
+}
+
 class TupleExprTree extends StandardPostOrderTree instanceof TupleExpr {
   override AstNode getChildNode(int i) { result = super.getField(i) }
 }
@@ -507,6 +538,10 @@ class TypeRefTree extends LeafTree instanceof TypeRef { }
 
 class UnderscoreExprTree extends LeafTree instanceof UnderscoreExpr { }
 
+class UseTree_ extends StandardPreOrderTree, Use {
+  override AstNode getChildNode(int i) { i = 0 and result = this.getUseTree().getPath() }
+}
+
 // NOTE: `yield` is a reserved but unused keyword.
 class YieldExprTree extends StandardPostOrderTree instanceof YieldExpr {
   override AstNode getChildNode(int i) { i = 0 and result = super.getExpr() }
diff --git a/rust/ql/test/extractor-tests/generated/Abi/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Abi/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8d4bdf6cd3dc3..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Abi/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_abi.rs:3:1:6:1 | test_abi |
diff --git a/rust/ql/test/extractor-tests/generated/ArgList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ArgList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 9d248b750b839..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ArgList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_arg_list.rs:3:1:6:1 | test_arg_list |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ArrayExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 4bf8e40621219..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_array_expr.rs:5:5:5:14 | ExprStmt |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ArrayType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 62342a759d5b5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_array_type.rs:3:1:6:1 | test_array_type |
diff --git a/rust/ql/test/extractor-tests/generated/AssocItemList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/AssocItemList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index cc7eef9075c09..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AssocItemList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_assoc_item_list.rs:3:1:6:1 | test_assoc_item_list |
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 0b79831a0c6c9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_assoc_type_arg.rs:3:1:6:1 | test_assoc_type_arg |
diff --git a/rust/ql/test/extractor-tests/generated/Attr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Attr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 0b123c1df9bff..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Attr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_attr.rs:3:1:6:1 | test_attr |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ClosureBinder/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index f60c0a4be22e1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureBinder/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_closure_binder.rs:3:1:6:1 | test_closure_binder |
diff --git a/rust/ql/test/extractor-tests/generated/Const/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Const/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ee1cb7311e757..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Const/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_const.rs:3:1:6:1 | test_const |
diff --git a/rust/ql/test/extractor-tests/generated/ConstArg/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ConstArg/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index bc07de34ae2aa..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ConstArg/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_const_arg.rs:3:1:6:1 | test_const_arg |
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ConstParam/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 634709095ffd5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ConstParam/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_const_param.rs:3:1:6:1 | test_const_param |
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/DynTraitType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 4753404b64da0..0000000000000
--- a/rust/ql/test/extractor-tests/generated/DynTraitType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_dyn_trait_type.rs:3:1:6:1 | test_dyn_trait_type |
diff --git a/rust/ql/test/extractor-tests/generated/Enum/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Enum/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 112cd9bc2ff86..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Enum/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_enum.rs:3:1:6:1 | test_enum |
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ExprStmt/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 1013a9a4bb515..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ExprStmt/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_expr_stmt.rs:6:5:6:12 | CallExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index dcd514c03c235..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ExternBlock/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_extern_block.rs:3:1:6:1 | test_extern_block |
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index a3657bdec4eb5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ExternCrate/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_extern_crate.rs:3:1:6:1 | test_extern_crate |
diff --git a/rust/ql/test/extractor-tests/generated/ExternItemList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ExternItemList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 004b9a6b6a2e2..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ExternItemList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_extern_item_list.rs:3:1:6:1 | test_extern_item_list |
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/FnPtrType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ee3d592a18f52..0000000000000
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_fn_ptr_type.rs:3:1:6:1 | test_fn_ptr_type |
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ForExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 536401b32bd67..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ForExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_for_expr.rs:3:1:6:1 | test_for_expr |
diff --git a/rust/ql/test/extractor-tests/generated/ForType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ForType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 9b87a1cae09be..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ForType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_for_type.rs:3:1:6:1 | test_for_type |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/FormatArgsArg/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 80e93a811d5c9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/FormatArgsArg/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_format_args_arg.rs:3:1:6:1 | test_format_args_arg |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 7fb70c61bde51..0000000000000
--- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_format_args_expr.rs:3:1:6:1 | test_format_args_expr |
diff --git a/rust/ql/test/extractor-tests/generated/GenericParamList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/GenericParamList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 1468fc6dd52d1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/GenericParamList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_generic_param_list.rs:3:1:6:1 | test_generic_param_list |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/IfExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8049e813d65ea..0000000000000
--- a/rust/ql/test/extractor-tests/generated/IfExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_if_expr.rs:6:9:6:38 | ExprStmt |
diff --git a/rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 43501141e2be1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Impl/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_impl.rs:3:1:6:1 | test_impl |
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ImplTraitType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index a88979d04764d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ImplTraitType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_impl_trait_type.rs:3:1:6:1 | test_impl_trait_type |
diff --git a/rust/ql/test/extractor-tests/generated/InferType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/InferType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 2eaf72e19646d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/InferType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_infer_type.rs:3:1:6:1 | test_infer_type |
diff --git a/rust/ql/test/extractor-tests/generated/ItemList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ItemList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 47b7abefadc3c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ItemList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_item_list.rs:3:1:6:1 | test_item_list |
diff --git a/rust/ql/test/extractor-tests/generated/Label/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Label/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8409c37b36511..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Label/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_label.rs:6:9:6:41 | ExprStmt |
diff --git a/rust/ql/test/extractor-tests/generated/LetElse/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/LetElse/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 3e531a4f531cf..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetElse/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_let_else.rs:3:1:6:1 | test_let_else |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/LetExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index b095048ef145f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LetExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_let_expr.rs:6:9:6:26 | ExprStmt |
diff --git a/rust/ql/test/extractor-tests/generated/Lifetime/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Lifetime/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5ce6674c6dbc5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Lifetime/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_lifetime.rs:3:1:6:1 | test_lifetime |
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeArg/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/LifetimeArg/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index e7fb5e883146b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LifetimeArg/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_lifetime_arg.rs:3:1:6:1 | test_lifetime_arg |
diff --git a/rust/ql/test/extractor-tests/generated/LifetimeParam/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/LifetimeParam/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index e8267e0360984..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LifetimeParam/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_lifetime_param.rs:3:1:6:1 | test_lifetime_param |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 51c4af3241b08..0000000000000
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_loop_expr.rs:6:9:6:42 | ExprStmt |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroCall/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 6d53cc3fb6cbd..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroCall/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_call.rs:3:1:6:1 | test_macro_call |
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroDef/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 35a5ed182593b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroDef/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_def.rs:3:1:6:1 | test_macro_def |
diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index f1bbf3a66f5a9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_expr.rs:3:1:6:1 | test_macro_expr |
diff --git a/rust/ql/test/extractor-tests/generated/MacroPat/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroPat/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index bc683af914623..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroPat/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_pat.rs:3:1:6:1 | test_macro_pat |
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroRules/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5705ce5516354..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroRules/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_rules.rs:3:1:6:1 | test_macro_rules |
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 12fc80e517d5d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MacroType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_macro_type.rs:3:1:6:1 | test_macro_type |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchArm/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index e558c7c1c28d6..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchArm/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_match_arm.rs:10:20:10:25 | ... != ... |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArmList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchArmList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 1f87a7f2ff2f2..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchArmList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_match_arm_list.rs:3:1:6:1 | test_match_arm_list |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8d6730211c8e3..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-deadEnd
-| gen_match_expr.rs:10:20:10:25 | ... != ... |
diff --git a/rust/ql/test/extractor-tests/generated/MatchGuard/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/MatchGuard/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index c43c4e80a15f8..0000000000000
--- a/rust/ql/test/extractor-tests/generated/MatchGuard/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_match_guard.rs:3:1:6:1 | test_match_guard |
diff --git a/rust/ql/test/extractor-tests/generated/Meta/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Meta/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5b99494cfb9b1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Meta/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_meta.rs:3:1:6:1 | test_meta |
diff --git a/rust/ql/test/extractor-tests/generated/Name/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Name/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ab6b629565a7e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Name/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_name.rs:3:1:6:1 | test_name |
diff --git a/rust/ql/test/extractor-tests/generated/NameRef/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/NameRef/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 00229745d5e81..0000000000000
--- a/rust/ql/test/extractor-tests/generated/NameRef/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_name_ref.rs:3:1:6:1 | test_name_ref |
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/NeverType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index f439296033cc9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/NeverType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_never_type.rs:3:1:6:1 | test_never_type |
diff --git a/rust/ql/test/extractor-tests/generated/Param/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Param/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 4ae2cf3ef7a75..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Param/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_param.rs:3:1:6:1 | test_param |
diff --git a/rust/ql/test/extractor-tests/generated/ParamList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ParamList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5ec0293119d0d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ParamList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_param_list.rs:3:1:6:1 | test_param_list |
diff --git a/rust/ql/test/extractor-tests/generated/ParenExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ParenExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index d6456a3eeaf37..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_paren_expr.rs:3:1:6:1 | test_paren_expr |
diff --git a/rust/ql/test/extractor-tests/generated/ParenPat/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ParenPat/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8bae5ce6c3bf7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenPat/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_paren_pat.rs:3:1:6:1 | test_paren_pat |
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ParenType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 2b51b5ff5c74c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ParenType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_paren_type.rs:3:1:6:1 | test_paren_type |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/PathSegment/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ce4905c17cbb2..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PathSegment/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_path_segment.rs:3:1:6:1 | test_path_segment |
diff --git a/rust/ql/test/extractor-tests/generated/PathType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/PathType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index d274a77daf7b0..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PathType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_path_type.rs:3:1:6:1 | test_path_type |
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/PtrType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index a85b631b54dd1..0000000000000
--- a/rust/ql/test/extractor-tests/generated/PtrType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_ptr_type.rs:3:1:6:1 | test_ptr_type |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordExprFieldList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 979b32ad4d84d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordExprFieldList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_record_expr_field_list.rs:3:1:6:1 | test_record_expr_field_list |
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordField/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 233c2442b42bf..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordField/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_record_field.rs:3:1:6:1 | test_record_field |
diff --git a/rust/ql/test/extractor-tests/generated/RecordFieldList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordFieldList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 28fe2e3666a43..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordFieldList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_record_field_list.rs:3:1:6:1 | test_record_field_list |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RecordPatFieldList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 90d25f25c4dc7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RecordPatFieldList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_record_pat_field_list.rs:3:1:6:1 | test_record_pat_field_list |
diff --git a/rust/ql/test/extractor-tests/generated/RefType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RefType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index c8e70e9406c77..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RefType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_ref_type.rs:3:1:6:1 | test_ref_type |
diff --git a/rust/ql/test/extractor-tests/generated/Rename/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Rename/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index da7a362c6c575..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Rename/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_rename.rs:3:1:6:1 | test_rename |
diff --git a/rust/ql/test/extractor-tests/generated/RestPat/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RestPat/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 4a73b0c3aca52..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RestPat/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_rest_pat.rs:3:1:6:1 | test_rest_pat |
diff --git a/rust/ql/test/extractor-tests/generated/RetType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/RetType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index c203f29b42431..0000000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_ret_type.rs:3:1:6:1 | test_ret_type |
diff --git a/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 74c6038da1318..0000000000000
--- a/rust/ql/test/extractor-tests/generated/ReturnTypeSyntax/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_return_type_syntax.rs:3:1:6:1 | test_return_type_syntax |
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/SelfParam/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ffd6ee6bb3a7e..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SelfParam/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_self_param.rs:3:1:6:1 | test_self_param |
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/SliceType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 1785d38746fbf..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SliceType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_slice_type.rs:3:1:6:1 | test_slice_type |
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/SourceFile/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 77f954842667f..0000000000000
--- a/rust/ql/test/extractor-tests/generated/SourceFile/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_source_file.rs:3:1:6:1 | test_source_file |
diff --git a/rust/ql/test/extractor-tests/generated/Static/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Static/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 405775d544597..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Static/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_static.rs:3:1:6:1 | test_static |
diff --git a/rust/ql/test/extractor-tests/generated/StmtList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/StmtList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 3772daffc17ed..0000000000000
--- a/rust/ql/test/extractor-tests/generated/StmtList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_stmt_list.rs:3:1:6:1 | test_stmt_list |
diff --git a/rust/ql/test/extractor-tests/generated/Struct/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Struct/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 6aedff0227a84..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Struct/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_struct.rs:3:1:6:1 | test_struct |
diff --git a/rust/ql/test/extractor-tests/generated/TokenTree/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TokenTree/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index b1414f7d8ac5d..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TokenTree/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_token_tree.rs:3:1:6:1 | test_token_tree |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Trait/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 9988046e52dab..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Trait/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_trait.rs:3:1:6:1 | test_trait |
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5216d265777ec..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TraitAlias/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_trait_alias.rs:3:1:6:1 | test_trait_alias |
diff --git a/rust/ql/test/extractor-tests/generated/TryExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TryExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 9cd4cb86f31a7..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TryExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_try_expr.rs:3:1:6:1 | test_try_expr |
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TupleField/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index ba75cb574e11a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleField/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_tuple_field.rs:3:1:6:1 | test_tuple_field |
diff --git a/rust/ql/test/extractor-tests/generated/TupleFieldList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TupleFieldList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 94ad834a83f74..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleFieldList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_tuple_field_list.rs:3:1:6:1 | test_tuple_field_list |
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TupleType/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index df23cd353b8ed..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TupleType/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_tuple_type.rs:3:1:6:1 | test_tuple_type |
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 5473c4f4d29fd..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_type_alias.rs:3:1:6:1 | test_type_alias |
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeArg/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index a4ef31c67be5b..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeArg/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_type_arg.rs:3:1:6:1 | test_type_arg |
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeBound/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 65b362b2ce062..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeBound/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_type_bound.rs:3:1:6:1 | test_type_bound |
diff --git a/rust/ql/test/extractor-tests/generated/TypeBoundList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeBoundList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 11f983ef491e4..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeBoundList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_type_bound_list.rs:3:1:6:1 | test_type_bound_list |
diff --git a/rust/ql/test/extractor-tests/generated/TypeParam/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/TypeParam/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index d852e7f00743c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/TypeParam/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_type_param.rs:3:1:6:1 | test_type_param |
diff --git a/rust/ql/test/extractor-tests/generated/Union/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Union/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 2e1da077f3750..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Union/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_union.rs:3:1:6:1 | test_union |
diff --git a/rust/ql/test/extractor-tests/generated/Use/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Use/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index eb0529d66f9a9..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Use/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_use.rs:3:1:6:1 | test_use |
diff --git a/rust/ql/test/extractor-tests/generated/UseTree/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/UseTree/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 0f5a9b35a2df5..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UseTree/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_use_tree.rs:3:1:6:1 | test_use_tree |
diff --git a/rust/ql/test/extractor-tests/generated/UseTreeList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/UseTreeList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index d754f9e4cf638..0000000000000
--- a/rust/ql/test/extractor-tests/generated/UseTreeList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_use_tree_list.rs:3:1:6:1 | test_use_tree_list |
diff --git a/rust/ql/test/extractor-tests/generated/Variant/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Variant/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index e60f96aeee22c..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Variant/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_variant.rs:3:1:6:1 | test_variant |
diff --git a/rust/ql/test/extractor-tests/generated/VariantList/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/VariantList/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 16e583712b31a..0000000000000
--- a/rust/ql/test/extractor-tests/generated/VariantList/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_variant_list.rs:3:1:6:1 | test_variant_list |
diff --git a/rust/ql/test/extractor-tests/generated/Visibility/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/Visibility/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 331e57ed0a415..0000000000000
--- a/rust/ql/test/extractor-tests/generated/Visibility/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_visibility.rs:3:1:6:1 | test_visibility |
diff --git a/rust/ql/test/extractor-tests/generated/WhereClause/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/WhereClause/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 2606d6d4113f6..0000000000000
--- a/rust/ql/test/extractor-tests/generated/WhereClause/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_where_clause.rs:3:1:6:1 | test_where_clause |
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/WherePred/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index e5601587a5fee..0000000000000
--- a/rust/ql/test/extractor-tests/generated/WherePred/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_where_pred.rs:3:1:6:1 | test_where_pred |
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/extractor-tests/generated/WhileExpr/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index b9d575da04470..0000000000000
--- a/rust/ql/test/extractor-tests/generated/WhileExpr/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-scopeNoFirst
-| gen_while_expr.rs:3:1:6:1 | test_while_expr |
diff --git a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index 8aa73f9d3c1f0..0000000000000
--- a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-deadEnd
-| error.rs:2:5:2:32 | ExprStmt |
-| my_macro.rs:16:9:16:19 | ExprStmt |
-| my_struct.rs:17:9:17:34 | ExprStmt |
diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected
deleted file mode 100644
index f88f86c81777e..0000000000000
--- a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/CfgConsistency.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-deadEnd
-| main.rs:14:2:14:23 | ExprStmt |
-| main.rs:38:2:38:23 | ExprStmt |
-| main.rs:93:2:93:44 | ExprStmt |
-| main.rs:107:2:107:20 | LetStmt |
-| main.rs:151:2:151:53 | ExprStmt |
-scopeNoFirst
-| main.rs:125:1:133:1 | statics |