Rust: update model generator tests

Author: redsun82

rust/ql/test/utils-tests/modelgenerator/CaptureSinkModels.ext.yml

@@ -1,6 +1,6 @@
 extensions:
   - addsTo:
       pack: codeql/rust-all
-      extensible: sinkModelDeprecated
+      extensible: sinkModel
     data:
-      - ["repo::test", "crate::sinks::known_sink", "Argument[0]", "test-sink", "manual"]
+      - ["test::sinks::known_sink", "Argument[0]", "test-sink", "manual"]

rust/ql/test/utils-tests/modelgenerator/CaptureSinkModels.ql

@@ -4,7 +4,9 @@ import SinkModels
 import utils.test.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
-  string getCapturedModel(Function f) { result = Heuristic::captureSink(f) }
+  string getCapturedModel(Function f) {
+    exists(QualifiedCallable qc | f = qc.asFunction() | result = Heuristic::captureSink(qc))
+  }
 
   string getKind() { result = "sink" }
 }

rust/ql/test/utils-tests/modelgenerator/CaptureSourceModels.ext.yml

@@ -1,6 +1,6 @@
 extensions:
   - addsTo:
       pack: codeql/rust-all
-      extensible: sourceModelDeprecated
+      extensible: sourceModel
     data:
-      - ["repo::test", "crate::sources::known_source", "ReturnValue", "test-source", "manual"]
+      - ["test::sources::known_source", "ReturnValue", "test-source", "manual"]

rust/ql/test/utils-tests/modelgenerator/CaptureSourceModels.ql

@@ -5,7 +5,9 @@ import utils.test.InlineMadTest
 import codeql.rust.dataflow.internal.ModelsAsData
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
-  string getCapturedModel(Function c) { result = Heuristic::captureSource(c) }
+  string getCapturedModel(Function c) {
+    exists(QualifiedCallable qc | c = qc.asFunction() | result = Heuristic::captureSource(qc))
+  }
 
   string getKind() { result = "source" }
 }

rust/ql/test/utils-tests/modelgenerator/CaptureSummaryModels.ql

@@ -4,7 +4,11 @@ import SummaryModels
 import utils.test.InlineMadTest
 
 module InlineMadTestConfig implements InlineMadTestConfigSig {
-  string getCapturedModel(Function f) { result = ContentSensitive::captureFlow(f, _, _, _, _) }
+  string getCapturedModel(Function f) {
+    exists(QualifiedCallable qc | f = qc.asFunction() |
+      result = ContentSensitive::captureFlow(qc, _, _, _, _)
+    )
+  }
 
   string getKind() { result = "summary" }
 }

rust/ql/test/utils-tests/modelgenerator/option.rs

@@ -3,7 +3,7 @@ fn known_sink(n: i64) {
     ()
 }
 
-// sink=repo::test;crate::sinks::derived_sink;Argument[1];test-sink;df-generated
+// sink=test::sinks::derived_sink;Argument[1];test-sink;df-generated
 pub fn derived_sink(c: bool, n: i64) -> i64 {
     if c {
         known_sink(n);

rust/ql/test/utils-tests/modelgenerator/sinks.rs

@@ -3,8 +3,8 @@ fn known_source(n: i64) -> i64 {
     n
 }
 
-// source=repo::test;crate::sources::derived_source;ReturnValue;test-source;df-generated
-// summary=repo::test;crate::sources::derived_source;Argument[1];ReturnValue;value;dfc-generated
+// source=test::sources::derived_source;ReturnValue;test-source;df-generated
+// summary=test::sources::derived_source;Argument[1];ReturnValue;value;dfc-generated
 pub fn derived_source(c: bool, n: i64) -> i64 {
     if c {
         known_source(n)

rust/ql/test/utils-tests/modelgenerator/sources.rs

@@ -1,4 +1,4 @@
-// summary=repo::test;crate::summaries::identity;Argument[0];ReturnValue;value;dfc-generated
+// summary=test::summaries::identity;Argument[0];ReturnValue;value;dfc-generated
 pub fn identity<A>(a: A) -> A {
     a
 }
@@ -16,23 +16,23 @@ pub enum Either<A, B> {
 use Either::*;
 
 impl<A, B> Either<A, B> {
-    // summary=repo::test;<crate::summaries::Either>::new;Argument[0];ReturnValue.Field[test::summaries::Either::Right(0)];value;dfc-generated
+    // summary=<test::summaries::Either>::new;Argument[0];ReturnValue.Field[test::summaries::Either::Right(0)];value;dfc-generated
     pub fn new(b: B) -> Self {
         Right(b)
     }
 
-    // summary=repo::test;<crate::summaries::Either>::unwrap;Argument[self].Field[test::summaries::Either::Right(0)];ReturnValue;value;dfc-generated
+    // summary=<test::summaries::Either>::unwrap;Argument[self].Field[test::summaries::Either::Right(0)];ReturnValue;value;dfc-generated
     pub fn unwrap(self) -> B {
         match self {
             Left(a) => panic!("Left cannot be unwrapped"),
             Right(b) => b,
         }
     }
 
-    // summary=repo::test;<crate::summaries::Either>::zip;Argument[0].Field[test::summaries::Either::Left(0)];ReturnValue.Field[test::summaries::Either::Left(0)];value;dfc-generated
-    // summary=repo::test;<crate::summaries::Either>::zip;Argument[0].Field[test::summaries::Either::Right(0)];ReturnValue.Field[test::summaries::Either::Right(0)].Field[1];value;dfc-generated
-    // summary=repo::test;<crate::summaries::Either>::zip;Argument[self].Field[test::summaries::Either::Left(0)];ReturnValue.Field[test::summaries::Either::Left(0)];value;dfc-generated
-    // summary=repo::test;<crate::summaries::Either>::zip;Argument[self].Field[test::summaries::Either::Right(0)];ReturnValue.Field[test::summaries::Either::Right(0)].Field[0];value;dfc-generated
+    // summary=<test::summaries::Either>::zip;Argument[0].Field[test::summaries::Either::Left(0)];ReturnValue.Field[test::summaries::Either::Left(0)];value;dfc-generated
+    // summary=<test::summaries::Either>::zip;Argument[0].Field[test::summaries::Either::Right(0)];ReturnValue.Field[test::summaries::Either::Right(0)].Field[1];value;dfc-generated
+    // summary=<test::summaries::Either>::zip;Argument[self].Field[test::summaries::Either::Left(0)];ReturnValue.Field[test::summaries::Either::Left(0)];value;dfc-generated
+    // summary=<test::summaries::Either>::zip;Argument[self].Field[test::summaries::Either::Right(0)];ReturnValue.Field[test::summaries::Either::Right(0)].Field[0];value;dfc-generated
     pub fn zip<C>(self, other: Either<A, C>) -> Either<A, (B, C)> {
         match (self, other) {
             (Right(b), Right(d)) => Right((b, d)),
@@ -48,20 +48,20 @@ pub struct MyStruct {
 }
 
 impl MyStruct {
-    // summary=repo::test;<crate::summaries::MyStruct>::new;Argument[0];ReturnValue.Field[test::summaries::MyStruct::foo];value;dfc-generated
-    // summary=repo::test;<crate::summaries::MyStruct>::new;Argument[1];ReturnValue.Field[test::summaries::MyStruct::bar];value;dfc-generated
+    // summary=<test::summaries::MyStruct>::new;Argument[0];ReturnValue.Field[test::summaries::MyStruct::foo];value;dfc-generated
+    // summary=<test::summaries::MyStruct>::new;Argument[1];ReturnValue.Field[test::summaries::MyStruct::bar];value;dfc-generated
     pub fn new(a: i64, b: f64) -> MyStruct {
         MyStruct { foo: a, bar: b }
     }
 
-    // summary=repo::test;<crate::summaries::MyStruct>::get_foo;Argument[self].Field[test::summaries::MyStruct::foo];ReturnValue;value;dfc-generated
+    // summary=<test::summaries::MyStruct>::get_foo;Argument[self].Field[test::summaries::MyStruct::foo];ReturnValue;value;dfc-generated
     pub fn get_foo(self) -> i64 {
         match self {
             MyStruct { foo, bar: _ } => foo,
         }
     }
 
-    // summary=repo::test;<crate::summaries::MyStruct>::get_bar;Argument[self].Field[test::summaries::MyStruct::bar];ReturnValue;value;dfc-generated
+    // summary=<test::summaries::MyStruct>::get_bar;Argument[self].Field[test::summaries::MyStruct::bar];ReturnValue;value;dfc-generated
     pub fn get_bar(self) -> f64 {
         match self {
             MyStruct { foo: _, bar } => bar,
@@ -71,8 +71,8 @@ impl MyStruct {
 
 // Higher-order functions
 
-// summary=repo::test;crate::summaries::apply;Argument[0];Argument[1].Parameter[0];value;dfc-generated
-// summary=repo::test;crate::summaries::apply;Argument[1].ReturnValue;ReturnValue;value;dfc-generated
+// summary=test::summaries::apply;Argument[0];Argument[1].Parameter[0];value;dfc-generated
+// summary=test::summaries::apply;Argument[1].ReturnValue;ReturnValue;value;dfc-generated
 pub fn apply<F>(n: i64, f: F) -> i64
 where
     F: FnOnce(i64) -> i64,
@@ -82,12 +82,12 @@ where
 
 // Flow out of mutated arguments
 
-// summary=repo::test;crate::summaries::set_int;Argument[1];Argument[0].Reference;value;dfc-generated
+// summary=test::summaries::set_int;Argument[1];Argument[0].Reference;value;dfc-generated
 pub fn set_int(n: &mut i64, c: i64) {
     *n = c;
 }
 
-// summary=repo::test;crate::summaries::read_int;Argument[0].Reference;ReturnValue;value;dfc-generated
+// summary=test::summaries::read_int;Argument[0].Reference;ReturnValue;value;dfc-generated
 pub fn read_int(n: &mut i64) -> i64 {
     *n
 }