Merge branch 'redsun82/rust-expand-assoc-items' into redsun82/cargo-upgrade-3

Author: redsun82

rust/extractor/src/qltest.rs

@@ -91,6 +91,6 @@ pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> {
         } else {
             anyhow::bail!("requested cargo check failed");
         }
-    }
+    };
     Ok(())
 }

rust/extractor/src/qltest_cargo.mustache

@@ -31,7 +31,7 @@ proc_macro = { path = "../.proc_macro" }
 {{#Macro}}
 [package]
 name = "proc_macro"
-version = "0.1.0"
+version = "0.0.1"
 edition = "2021"
 [lib]
 path = "../proc_macro.rs"

rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,3 +1,3 @@
 multiplePathResolutions
 | macro_expansion.rs:1:5:1:14 | proc_macro | file://:0:0:0:0 | Crate([email protected]) |
-| macro_expansion.rs:1:5:1:14 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.1.0) |
+| macro_expansion.rs:1:5:1:14 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |

rust/ql/test/extractor-tests/macro-expansion/Cargo.lock

@@ -1,3 +1,9 @@
 multiplePathResolutions
 | main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
 | main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
+| main.rs:626:3:626:12 | proc_macro | file://:0:0:0:0 | Crate([email protected]) |
+| main.rs:626:3:626:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate([email protected]) |
+| main.rs:631:7:631:16 | proc_macro | file://:0:0:0:0 | Crate([email protected]) |
+| main.rs:631:7:631:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate([email protected]) |
+| main.rs:634:7:634:16 | proc_macro | file://:0:0:0:0 | Crate([email protected]) |
+| main.rs:634:7:634:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate([email protected]) |

rust/ql/test/library-tests/dataflow/models/Cargo.lock

@@ -267,14 +267,14 @@ resolvePath
 | main.rs:620:9:620:47 | ...::call_both | main.rs:586:9:589:9 | fn call_both |
 | main.rs:620:25:620:35 | Implementor | main.rs:592:5:592:23 | struct Implementor |
 | main.rs:626:3:626:12 | proc_macro | {EXTERNAL LOCATION} | Crate([email protected]) |
-| main.rs:626:3:626:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.1.0) |
+| main.rs:626:3:626:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
 | main.rs:626:3:626:24 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
 | main.rs:630:6:630:12 | AStruct | main.rs:629:1:629:17 | struct AStruct |
 | main.rs:631:7:631:16 | proc_macro | {EXTERNAL LOCATION} | Crate([email protected]) |
-| main.rs:631:7:631:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.1.0) |
+| main.rs:631:7:631:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
 | main.rs:631:7:631:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
 | main.rs:634:7:634:16 | proc_macro | {EXTERNAL LOCATION} | Crate([email protected]) |
-| main.rs:634:7:634:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.1.0) |
+| main.rs:634:7:634:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
 | main.rs:634:7:634:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
 | main.rs:639:5:639:6 | my | main.rs:1:1:1:7 | mod my |
 | main.rs:639:5:639:14 | ...::nested | my.rs:1:1:1:15 | mod nested |