Use Cargo.lock from workspace root

cbindgen currently assumes that the `Cargo.lock` is in directly in the
crate directory as a sibling to `Cargo.toml`; however that is usually
not the case inside a workspace.

Instead, this PR extracts the workspace root from the output of `cargo
metadata` [1] (already used to get a list of packages) and uses the
`Cargo.lock` from there.

 1. This is available since Rust 1.24; see rust-lang/cargo#4940

Author: Elarnon

src/bindgen/cargo/cargo.rs

@@ -46,10 +46,13 @@ impl Cargo {
         clean: bool,
     ) -> Result<Cargo, Error> {
         let toml_path = crate_dir.join("Cargo.toml");
-        let lock_path = match lock_file {
-            Some(v) => PathBuf::from(v),
-            None => crate_dir.join("Cargo.lock"),
-        };
+        let metadata = cargo_metadata::metadata(&toml_path)
+            .map_err(|x| Error::CargoMetadata(toml_path.to_str().unwrap().to_owned(), x))?;
+        let lock_path = lock_file
+            .map(PathBuf::from)
+            .unwrap_or_else(|| {
+                Path::new(&metadata.workspace_root).join("Cargo.lock")
+            });
 
         let lock = if use_cargo_lock {
             match cargo_lock::lock(&lock_path) {
@@ -62,8 +65,6 @@ impl Cargo {
         } else {
             None
         };
-        let metadata = cargo_metadata::metadata(&toml_path)
-            .map_err(|x| Error::CargoMetadata(toml_path.to_str().unwrap().to_owned(), x))?;
 
         // Use the specified binding crate name or infer it from the manifest
         let manifest = cargo_toml::manifest(&toml_path)

src/bindgen/cargo/cargo_metadata.rs

@@ -24,6 +24,8 @@ pub struct Metadata {
     /// A list of all crates referenced by this crate (and the crate itself)
     pub packages: Vec<Package>,
     version: usize,
+    /// path to the workspace containing the `Cargo.lock`
+    pub workspace_root: String,
 }
 
 #[derive(Clone, Deserialize, Debug)]

tests/expectations/both/external_workspace_child.c

@@ -0,0 +1,9 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+typedef struct ExtType {
+  uint32_t data;
+} ExtType;
+
+void consume_ext(ExtType _ext);

tests/expectations/both/workspace.c

@@ -0,0 +1,9 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+typedef struct ExtType {
+  uint32_t data;
+} ExtType;
+
+void consume_ext(ExtType _ext);

tests/expectations/external_workspace_child.c

@@ -0,0 +1,9 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+typedef struct {
+  uint32_t data;
+} ExtType;
+
+void consume_ext(ExtType _ext);

tests/expectations/external_workspace_child.cpp

@@ -0,0 +1,12 @@
+#include <cstdint>
+#include <cstdlib>
+
+struct ExtType {
+  uint32_t data;
+};
+
+extern "C" {
+
+void consume_ext(ExtType _ext);
+
+} // extern "C"

tests/expectations/tag/external_workspace_child.c

@@ -0,0 +1,9 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+struct ExtType {
+  uint32_t data;
+};
+
+void consume_ext(struct ExtType _ext);

tests/expectations/tag/workspace.c

@@ -0,0 +1,9 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+struct ExtType {
+  uint32_t data;
+};
+
+void consume_ext(struct ExtType _ext);

tests/expectations/workspace.c

@@ -0,0 +1,9 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+typedef struct {
+  uint32_t data;
+} ExtType;
+
+void consume_ext(ExtType _ext);

tests/expectations/workspace.cpp

@@ -0,0 +1,12 @@
+#include <cstdint>
+#include <cstdlib>
+
+struct ExtType {
+  uint32_t data;
+};
+
+extern "C" {
+
+void consume_ext(ExtType _ext);
+
+} // extern "C"

tests/rust/external_workspace_child/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "child"
+version = "0.1.0"
+authors = ["cbindgen"]
+workspace = "../workspace"
+
+[dependencies.dep]
+path = "../workspace/dep"

tests/rust/external_workspace_child/cbindgen.toml

@@ -0,0 +1,2 @@
+[parse]
+parse_deps = true

tests/rust/external_workspace_child/src/lib.rs

@@ -0,0 +1,5 @@
+extern crate dep;
+
+#[no_mangle]
+pub extern "C" fn consume_ext(_ext: dep::ExtType) {
+}

tests/rust/workspace/Cargo.lock

@@ -0,0 +1,13 @@
+[package]
+name = "workspace"
+version = "0.1.0"
+authors = ["cbindgen"]
+
+[dependencies.dep]
+path = "dep"
+
+[workspace]
+members = [
+    "../external_workspace_child",
+    "dep",
+]

tests/rust/workspace/Cargo.toml

@@ -0,0 +1,2 @@
+[parse]
+parse_deps = true

tests/rust/workspace/cbindgen.toml

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

tests/rust/workspace/dep/Cargo.toml

@@ -0,0 +1,4 @@
+#[repr(C)]
+pub struct ExtType {
+    pub data: u32,
+}

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

@@ -0,0 +1,5 @@
+extern crate dep;
+
+#[no_mangle]
+pub extern "C" fn consume_ext(_ext: dep::ExtType) {
+}