Rust: Reorder columns in Definitions.ql test

Author: hvitved

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

@@ -1,21 +1,21 @@
-| lib.rs:1:1:1:1 | SourceFile | main.rs:3:5:3:7 | lib | file |
-| main.rs:1:1:1:9 | struct S | main.rs:16:13:16:13 | S | path |
-| main.rs:6:9:6:13 | width | main.rs:9:29:9:33 | width | local variable |
-| main.rs:6:9:6:13 | width | main.rs:10:41:10:45 | width | local variable |
-| main.rs:6:9:6:13 | width | main.rs:11:36:11:40 | width | local variable |
-| main.rs:7:9:7:17 | precision | main.rs:9:36:9:44 | precision | local variable |
-| main.rs:7:9:7:17 | precision | main.rs:10:48:10:56 | precision | local variable |
-| main.rs:8:9:8:13 | value | main.rs:10:34:10:38 | value | local variable |
-| main.rs:8:9:8:13 | value | main.rs:11:29:11:33 | value | local variable |
-| main.rs:9:50:9:54 | value | main.rs:9:22:9:26 | value | format argument |
-| main.rs:10:34:10:38 | value | main.rs:10:22:10:22 | 0 | format argument |
-| main.rs:10:41:10:45 | width | main.rs:10:25:10:25 | 1 | format argument |
-| main.rs:10:48:10:56 | precision | main.rs:10:28:10:28 | 2 | format argument |
-| main.rs:11:29:11:33 | value | main.rs:11:21:11:22 | {} | format argument |
-| main.rs:11:36:11:40 | width | main.rs:11:24:11:25 | {} | format argument |
-| main.rs:12:9:12:14 | people | main.rs:13:22:13:27 | people | local variable |
-| main.rs:14:31:14:31 | 1 | main.rs:14:19:14:20 | {} | format argument |
-| main.rs:14:31:14:31 | 1 | main.rs:14:23:14:23 | 0 | format argument |
-| main.rs:14:34:14:34 | 2 | main.rs:14:16:14:16 | 1 | format argument |
-| main.rs:14:34:14:34 | 2 | main.rs:14:26:14:27 | {} | format argument |
-| main.rs:15:40:15:42 | "x" | main.rs:15:31:15:35 | {:<5} | format argument |
+| main.rs:3:5:3:7 | lib | lib.rs:1:1:1:1 | SourceFile | file |
+| main.rs:9:22:9:26 | value | main.rs:9:50:9:54 | value | format argument |
+| main.rs:9:29:9:33 | width | main.rs:6:9:6:13 | width | local variable |
+| main.rs:9:36:9:44 | precision | main.rs:7:9:7:17 | precision | local variable |
+| main.rs:10:22:10:22 | 0 | main.rs:10:34:10:38 | value | format argument |
+| main.rs:10:25:10:25 | 1 | main.rs:10:41:10:45 | width | format argument |
+| main.rs:10:28:10:28 | 2 | main.rs:10:48:10:56 | precision | format argument |
+| main.rs:10:34:10:38 | value | main.rs:8:9:8:13 | value | local variable |
+| main.rs:10:41:10:45 | width | main.rs:6:9:6:13 | width | local variable |
+| main.rs:10:48:10:56 | precision | main.rs:7:9:7:17 | precision | local variable |
+| main.rs:11:21:11:22 | {} | main.rs:11:29:11:33 | value | format argument |
+| main.rs:11:24:11:25 | {} | main.rs:11:36:11:40 | width | format argument |
+| main.rs:11:29:11:33 | value | main.rs:8:9:8:13 | value | local variable |
+| main.rs:11:36:11:40 | width | main.rs:6:9:6:13 | width | local variable |
+| main.rs:13:22:13:27 | people | main.rs:12:9:12:14 | people | local variable |
+| main.rs:14:16:14:16 | 1 | main.rs:14:34:14:34 | 2 | format argument |
+| main.rs:14:19:14:20 | {} | main.rs:14:31:14:31 | 1 | format argument |
+| main.rs:14:23:14:23 | 0 | main.rs:14:31:14:31 | 1 | format argument |
+| main.rs:14:26:14:27 | {} | main.rs:14:34:14:34 | 2 | format argument |
+| main.rs:15:31:15:35 | {:<5} | main.rs:15:40:15:42 | "x" | format argument |
+| main.rs:16:13:16:13 | S | main.rs:1:1:1:9 | struct S | path |

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

@@ -4,4 +4,4 @@ from Definition def, Use use, string kind
 where
   def = definitionOf(use, kind) and
   use.fromSource()
-select def, use, kind
+select use, def, kind