Rust: Make ql-for-ql happy.

Author: geoffw0

rust/ql/src/queries/summary/TaintSources.ql

@@ -13,5 +13,5 @@ import codeql.rust.Concepts
 
 from ThreatModelSource s, string defaultString
 where
-  if s instanceof ActiveThreatModelSource then defaultString = ", DEFAULT" else defaultString = ""
-select s, s.getSourceType() + " (" + s.getThreatModel() + defaultString + ")"
+  if s instanceof ActiveThreatModelSource then defaultString = " (DEFAULT)" else defaultString = ""
+select s, "Flow source '" + s.getSourceType() + "' of type " + s.getThreatModel() + defaultString + "."

rust/ql/test/library-tests/dataflow/sources/TaintSources.expected

@@ -1,17 +1,17 @@
-| test.rs:8:10:8:30 | CallExpr | EnvironmentSource (environment) |
-| test.rs:9:10:9:33 | CallExpr | EnvironmentSource (environment) |
-| test.rs:11:16:11:36 | CallExpr | EnvironmentSource (environment) |
-| test.rs:12:16:12:39 | CallExpr | EnvironmentSource (environment) |
-| test.rs:17:25:17:40 | CallExpr | EnvironmentSource (environment) |
-| test.rs:22:25:22:43 | CallExpr | EnvironmentSource (environment) |
-| test.rs:29:29:29:44 | CallExpr | CommandLineArgs (commandargs) |
-| test.rs:32:16:32:31 | CallExpr | CommandLineArgs (commandargs) |
-| test.rs:33:16:33:34 | CallExpr | CommandLineArgs (commandargs) |
-| test.rs:40:16:40:31 | CallExpr | CommandLineArgs (commandargs) |
-| test.rs:44:16:44:34 | CallExpr | CommandLineArgs (commandargs) |
-| test.rs:50:15:50:37 | CallExpr | CommandLineArgs (commandargs) |
-| test.rs:51:15:51:37 | CallExpr | CommandLineArgs (commandargs) |
-| test.rs:52:16:52:35 | CallExpr | CommandLineArgs (commandargs) |
-| test.rs:60:26:60:70 | CallExpr | RemoteSource (remote, DEFAULT) |
-| test.rs:63:26:63:70 | CallExpr | RemoteSource (remote, DEFAULT) |
-| test.rs:66:26:66:60 | CallExpr | RemoteSource (remote, DEFAULT) |
+| test.rs:8:10:8:30 | CallExpr | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:9:10:9:33 | CallExpr | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:11:16:11:36 | CallExpr | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:12:16:12:39 | CallExpr | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:17:25:17:40 | CallExpr | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:22:25:22:43 | CallExpr | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:29:29:29:44 | CallExpr | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:32:16:32:31 | CallExpr | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:33:16:33:34 | CallExpr | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:40:16:40:31 | CallExpr | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:44:16:44:34 | CallExpr | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:50:15:50:37 | CallExpr | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:51:15:51:37 | CallExpr | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:52:16:52:35 | CallExpr | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:60:26:60:70 | CallExpr | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:63:26:63:70 | CallExpr | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:66:26:66:60 | CallExpr | Flow source 'RemoteSource' of type remote (DEFAULT). |