From b912c04a7d18f26aa664efa85bbfeee60627f491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Fri, 20 Dec 2019 23:27:03 +0100
Subject: [PATCH] Add a test for expanding dependencies with Cargo.lock v2,
 with both conflicting and non-conflicting deps.

---
 tests/rust/expand_dep_v2/Cargo.lock        | 24 ++++++++++++++++++++++
 tests/rust/expand_dep_v2/Cargo.toml        |  9 ++++++++
 tests/rust/expand_dep_v2/cbindgen.toml     |  6 ++++++
 tests/rust/expand_dep_v2/dep/Cargo.toml    |  7 +++++++
 tests/rust/expand_dep_v2/dep/src/lib.rs    |  5 +++++
 tests/rust/expand_dep_v2/dep_v2/Cargo.toml |  7 +++++++
 tests/rust/expand_dep_v2/dep_v2/src/lib.rs |  5 +++++
 tests/rust/expand_dep_v2/src/lib.rs        |  6 ++++++
 8 files changed, 69 insertions(+)
 create mode 100644 tests/rust/expand_dep_v2/Cargo.lock
 create mode 100644 tests/rust/expand_dep_v2/Cargo.toml
 create mode 100644 tests/rust/expand_dep_v2/cbindgen.toml
 create mode 100644 tests/rust/expand_dep_v2/dep/Cargo.toml
 create mode 100644 tests/rust/expand_dep_v2/dep/src/lib.rs
 create mode 100644 tests/rust/expand_dep_v2/dep_v2/Cargo.toml
 create mode 100644 tests/rust/expand_dep_v2/dep_v2/src/lib.rs
 create mode 100644 tests/rust/expand_dep_v2/src/lib.rs

diff --git a/tests/rust/expand_dep_v2/Cargo.lock b/tests/rust/expand_dep_v2/Cargo.lock
new file mode 100644
index 0000000..5e12ed6
--- /dev/null
+++ b/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",
+]
diff --git a/tests/rust/expand_dep_v2/Cargo.toml b/tests/rust/expand_dep_v2/Cargo.toml
new file mode 100644
index 0000000..fbfeb8a
--- /dev/null
+++ b/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" }
diff --git a/tests/rust/expand_dep_v2/cbindgen.toml b/tests/rust/expand_dep_v2/cbindgen.toml
new file mode 100644
index 0000000..b6e180a
--- /dev/null
+++ b/tests/rust/expand_dep_v2/cbindgen.toml
@@ -0,0 +1,6 @@
+[parse]
+parse_deps = true
+include = ["dep"]
+
+[parse.expand]
+crates = ["expand-dep"]
diff --git a/tests/rust/expand_dep_v2/dep/Cargo.toml b/tests/rust/expand_dep_v2/dep/Cargo.toml
new file mode 100644
index 0000000..1cc8d62
--- /dev/null
+++ b/tests/rust/expand_dep_v2/dep/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "dep"
+version = "0.1.0"
+authors = ["cbindgen"]
+edition = "2018"
+
+[dependencies]
diff --git a/tests/rust/expand_dep_v2/dep/src/lib.rs b/tests/rust/expand_dep_v2/dep/src/lib.rs
new file mode 100644
index 0000000..7253c57
--- /dev/null
+++ b/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,
+}
diff --git a/tests/rust/expand_dep_v2/dep_v2/Cargo.toml b/tests/rust/expand_dep_v2/dep_v2/Cargo.toml
new file mode 100644
index 0000000..fe52e95
--- /dev/null
+++ b/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]
diff --git a/tests/rust/expand_dep_v2/dep_v2/src/lib.rs b/tests/rust/expand_dep_v2/dep_v2/src/lib.rs
new file mode 100644
index 0000000..7253c57
--- /dev/null
+++ b/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,
+}
diff --git a/tests/rust/expand_dep_v2/src/lib.rs b/tests/rust/expand_dep_v2/src/lib.rs
new file mode 100644
index 0000000..639678d
--- /dev/null
+++ b/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
+}