Rust: filter out definitions that are inside expanded macros

Author: aibaars

rust/ql/lib/codeql/rust/internal/Definitions.qll

@@ -8,6 +8,7 @@ private import codeql.rust.elements.Locatable
 private import codeql.rust.elements.FormatArgsExpr
 private import codeql.rust.elements.FormatArgsArg
 private import codeql.rust.elements.Format
+private import codeql.rust.elements.MacroCall
 private import codeql.rust.elements.NamedFormatArgument
 private import codeql.rust.elements.PositionalFormatArgument
 private import codeql.Locations
@@ -36,7 +37,9 @@ private module Cached {
    */
   cached
   Definition definitionOf(Use use, string kind) {
-    result = use.getDefinition() and kind = use.getUseType()
+    result = use.getDefinition() and
+    kind = use.getUseType() and
+    not result.getLocation() = any(MacroCall m).getLocation()
   }
 }
 

rust/ql/test/library-tests/definitions/Definitions.expected

@@ -16,8 +16,4 @@
 | main.rs:10:31:10:31 | 1 | main.rs:10:23:10:23 | 0 | format argument |
 | main.rs:10:34:10:34 | 2 | main.rs:10:16:10:16 | 1 | format argument |
 | main.rs:10:34:10:34 | 2 | main.rs:10:26:10:27 | {} | format argument |
-| main.rs:11:5:11:60 | left_val | main.rs:11:5:11:60 | left_val | local variable |
-| main.rs:11:5:11:60 | left_val | main.rs:11:5:11:60 | left_val | local variable |
-| main.rs:11:5:11:60 | right_val | main.rs:11:5:11:60 | right_val | local variable |
-| main.rs:11:5:11:60 | right_val | main.rs:11:5:11:60 | right_val | local variable |
 | main.rs:11:40:11:42 | "x" | main.rs:11:31:11:35 | {:<5} | format argument |