Add a test for expanding dependencies with Cargo.lock v2, with both conflicting and non-conflicting deps.

tests/rust/expand_dep_v2/Cargo.lock

@@ -0,0 +1,24 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "dep"
+version = "0.1.0"
+
+[[package]]
+name = "dep"
+version = "0.2.0"
+
+[[package]]
+name = "expand-dep"
+version = "0.1.0"
+dependencies = [
+ "dep 0.1.0",
+]
+
+[[package]]
+name = "expand-dep-2"
+version = "0.2.0"
+dependencies = [
+ "dep 0.2.0",
+ "expand-dep",
+]

tests/rust/expand_dep_v2/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "expand-dep-2"
+version = "0.2.0"
+authors = ["cbindgen"]
+edition = "2018"
+
+[dependencies]
+expand-dep = { path = "../expand_dep" }
+dep = { path = "dep_v2" }

tests/rust/expand_dep_v2/cbindgen.toml

@@ -0,0 +1,6 @@
+[parse]
+parse_deps = true
+include = ["dep"]
+
+[parse.expand]
+crates = ["expand-dep"]

tests/rust/expand_dep_v2/dep/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "dep"
+version = "0.1.0"
+authors = ["cbindgen"]
+edition = "2018"
+
+[dependencies]

tests/rust/expand_dep_v2/dep/src/lib.rs

@@ -0,0 +1,5 @@
+#[repr(C)]
+pub struct dep_struct {
+    pub x: u32,
+    pub y: f64,
+}

tests/rust/expand_dep_v2/dep_v2/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "dep"
+version = "0.2.0"
+authors = ["cbindgen"]
+edition = "2018"
+
+[dependencies]

tests/rust/expand_dep_v2/dep_v2/src/lib.rs

@@ -0,0 +1,5 @@
+#[repr(C)]
+pub struct dep_struct {
+    pub x: u32,
+    pub y: f64,
+}

tests/rust/expand_dep_v2/src/lib.rs

@@ -0,0 +1,6 @@
+use dep::dep_struct;
+
+#[no_mangle]
+pub unsafe extern "C" fn get_x(dep_struct: *const dep_struct) -> u32 {
+    dep_struct.read().x
+}