Rust: fix tests

Author: redsun82

rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected

@@ -5,6 +5,9 @@ canonicalPath
 | lib.rs:1:1:1:14 | mod anonymous | test::anonymous |
 | lib.rs:2:1:2:12 | mod regular | test::regular |
 | regular.rs:1:1:2:18 | struct Struct | test::regular::Struct |
+| regular.rs:2:12:2:17 | fn eq | <test::regular::Struct as core::cmp::PartialEq>::eq |
+| regular.rs:2:12:2:17 | impl ...::Eq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::Eq> |
+| regular.rs:2:12:2:17 | impl ...::PartialEq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::PartialEq> |
 | regular.rs:4:1:6:1 | trait Trait | test::regular::Trait |
 | regular.rs:5:5:5:16 | fn f | <_ as test::regular::Trait>::f |
 | regular.rs:8:1:10:1 | impl Trait for Struct { ... } | <test::regular::Struct as test::regular::Trait> |
@@ -42,6 +45,9 @@ canonicalPaths
 | lib.rs:1:1:1:14 | mod anonymous | repo::test | crate::anonymous |
 | lib.rs:2:1:2:12 | mod regular | repo::test | crate::regular |
 | regular.rs:1:1:2:18 | struct Struct | repo::test | crate::regular::Struct |
+| regular.rs:2:12:2:17 | fn eq | repo::test | <crate::regular::Struct as crate::cmp::PartialEq>::eq |
+| regular.rs:2:12:2:17 | impl ...::Eq for Struct::<...> { ... } | None | None |
+| regular.rs:2:12:2:17 | impl ...::PartialEq for Struct::<...> { ... } | None | None |
 | regular.rs:4:1:6:1 | trait Trait | repo::test | crate::regular::Trait |
 | regular.rs:5:5:5:16 | fn f | repo::test | crate::regular::Trait::f |
 | regular.rs:8:1:10:1 | impl Trait for Struct { ... } | None | None |
@@ -66,6 +72,8 @@ resolvedPaths
 | anonymous.rs:29:9:29:9 | s | None | None |
 | anonymous.rs:29:9:29:13 | s.g() | None | None |
 | anonymous.rs:30:9:30:14 | nested | None | None |
+| regular.rs:1:1:1:24 | other | None | None |
+| regular.rs:1:1:1:24 | self | None | None |
 | regular.rs:27:13:27:21 | Struct {...} | repo::test | crate::regular::Struct |
 | regular.rs:28:5:28:5 | s | None | None |
 | regular.rs:28:5:28:9 | s.f() | repo::test | <crate::regular::Struct as crate::regular::Trait>::f |

rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected

@@ -5,6 +5,9 @@ canonicalPath
 | lib.rs:1:1:1:14 | mod anonymous | test::anonymous |
 | lib.rs:2:1:2:12 | mod regular | test::regular |
 | regular.rs:4:1:5:18 | struct Struct | test::regular::Struct |
+| regular.rs:5:12:5:17 | fn eq | <test::regular::Struct as core::cmp::PartialEq>::eq |
+| regular.rs:5:12:5:17 | impl ...::Eq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::Eq> |
+| regular.rs:5:12:5:17 | impl ...::PartialEq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::PartialEq> |
 | regular.rs:7:1:9:1 | trait Trait | test::regular::Trait |
 | regular.rs:8:5:8:16 | fn f | <_ as test::regular::Trait>::f |
 | regular.rs:11:1:13:1 | impl Trait for Struct { ... } | <test::regular::Struct as test::regular::Trait> |
@@ -42,6 +45,9 @@ canonicalPaths
 | lib.rs:1:1:1:14 | mod anonymous | None | None |
 | lib.rs:2:1:2:12 | mod regular | None | None |
 | regular.rs:4:1:5:18 | struct Struct | None | None |
+| regular.rs:5:12:5:17 | fn eq | None | None |
+| regular.rs:5:12:5:17 | impl ...::Eq for Struct::<...> { ... } | None | None |
+| regular.rs:5:12:5:17 | impl ...::PartialEq for Struct::<...> { ... } | None | None |
 | regular.rs:7:1:9:1 | trait Trait | None | None |
 | regular.rs:8:5:8:16 | fn f | None | None |
 | regular.rs:11:1:13:1 | impl Trait for Struct { ... } | None | None |
@@ -66,6 +72,8 @@ resolvedPaths
 | anonymous.rs:32:9:32:9 | s | None | None |
 | anonymous.rs:32:9:32:13 | s.g() | None | None |
 | anonymous.rs:33:9:33:14 | nested | None | None |
+| regular.rs:4:1:4:24 | other | None | None |
+| regular.rs:4:1:4:24 | self | None | None |
 | regular.rs:30:13:30:21 | Struct {...} | None | None |
 | regular.rs:31:5:31:5 | s | None | None |
 | regular.rs:31:5:31:9 | s.f() | None | None |

rust/ql/test/extractor-tests/generated/Enum/Enum.expected

@@ -1 +1 @@
-| gen_enum.rs:4:5:7:34 | enum E | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | hasName: | yes | hasVariantList: | yes | hasVisibility: | no | hasWhereClause: | no |
+| gen_enum.rs:4:5:7:34 | enum E | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfDeriveMacroExpansions: | 0 | getNumberOfAttrs: | 0 | hasGenericParamList: | no | hasName: | yes | hasVariantList: | yes | hasVisibility: | no | hasWhereClause: | no |

rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected

@@ -1 +1,2 @@
 | gen_macro_items.rs:5:5:5:38 | MacroItems | getNumberOfItems: | 2 |
+| gen_macro_items.rs:13:12:13:14 | MacroItems | getNumberOfItems: | 1 |

rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected

@@ -1,2 +1,3 @@
 | gen_macro_items.rs:5:5:5:38 | MacroItems | 0 | gen_macro_items.rs:5:5:5:38 | use ...::Path |
 | gen_macro_items.rs:5:5:5:38 | MacroItems | 1 | gen_macro_items.rs:5:5:5:38 | fn get_parent |
+| gen_macro_items.rs:13:12:13:14 | MacroItems | 0 | gen_macro_items.rs:13:12:13:14 | impl ...::Debug for Bar::<...> { ... } |

rust/ql/test/extractor-tests/generated/Struct/Struct.expected

@@ -1 +1 @@
-| gen_struct.rs:4:5:8:5 | struct Point | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasFieldList: | yes | hasGenericParamList: | no | hasName: | yes | hasVisibility: | no | hasWhereClause: | no |
+| gen_struct.rs:4:5:8:5 | struct Point | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfDeriveMacroExpansions: | 0 | getNumberOfAttrs: | 0 | hasFieldList: | yes | hasGenericParamList: | no | hasName: | yes | hasVisibility: | no | hasWhereClause: | no |

rust/ql/test/extractor-tests/generated/Union/Union.expected

@@ -1 +1 @@
-| gen_union.rs:4:5:7:32 | union U | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasGenericParamList: | no | hasName: | yes | hasStructFieldList: | yes | hasVisibility: | no | hasWhereClause: | no |
+| gen_union.rs:4:5:7:32 | union U | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfDeriveMacroExpansions: | 0 | getNumberOfAttrs: | 0 | hasGenericParamList: | no | hasName: | yes | hasStructFieldList: | yes | hasVisibility: | no | hasWhereClause: | no |

rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected

@@ -86,6 +86,10 @@ multiplePathResolutions
 | test_futures_io.rs:25:23:25:61 | ...::try_from | file://:0:0:0:0 | fn try_from |
 | test_futures_io.rs:145:26:145:43 | ...::with_capacity | file://:0:0:0:0 | fn with_capacity |
 | test_futures_io.rs:145:26:145:43 | ...::with_capacity | file://:0:0:0:0 | fn with_capacity |
+| web_frameworks.rs:40:5:40:26 | ...::write_str | file://:0:0:0:0 | fn write_str |
+| web_frameworks.rs:40:5:40:26 | ...::write_str | file://:0:0:0:0 | fn write_str |
+| web_frameworks.rs:40:5:40:26 | ...::write_str | file://:0:0:0:0 | fn write_str |
+| web_frameworks.rs:40:5:40:26 | ...::write_str | file://:0:0:0:0 | fn write_str |
 multipleCanonicalPaths
 | file://:0:0:0:0 | fn to_ordering | file://:0:0:0:0 | Crate(typenum@1.18.0) | <typenum::Equal as core::cmp::Ord>::to_ordering |
 | file://:0:0:0:0 | fn to_ordering | file://:0:0:0:0 | Crate(typenum@1.18.0) | <typenum::Equal as typenum::marker_traits::Ord>::to_ordering |