From d7f47749a3a9a8531f647c532b310d28dd819709 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 20 Sep 2024 08:02:16 -0400
Subject: [PATCH] rust: Another attempt to fix docs.rs build

The build on docs.rs is still failing due to missing the C
library. The standard thing to do here is just not to look
for it when building docs.

This time I copied the setup from gtk4-rs; the newer pattern
here seems to be directly using `rustc-args` and `rustdoc-args`
instead of exposing a `dox` feature.

What I believe I missed in the last attempt was the copy
of `package.metadata.docs.rs` in the `composefs`
crate.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 rust/composefs-sys/Cargo.toml | 5 +++--
 rust/composefs-sys/build.rs   | 2 +-
 rust/composefs/Cargo.toml     | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/rust/composefs-sys/Cargo.toml b/rust/composefs-sys/Cargo.toml
index 15a40f0..8c4e654 100644
--- a/rust/composefs-sys/Cargo.toml
+++ b/rust/composefs-sys/Cargo.toml
@@ -10,14 +10,15 @@ license = "MIT OR Apache-2.0"
 readme = "README.md"
 
 [package.metadata.docs.rs]
-features = ["dox"]
+all-features = true
+rustc-args = ["--cfg", "docsrs"]
+rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
 
 [package.metadata.system-deps.composefs]
 name = "composefs"
 version = "1"
 
 [features]
-dox = []
 # Depend on 1.0.4 APIs
 v1_0_4 = []
 
diff --git a/rust/composefs-sys/build.rs b/rust/composefs-sys/build.rs
index 54331fb..cfabe82 100644
--- a/rust/composefs-sys/build.rs
+++ b/rust/composefs-sys/build.rs
@@ -1,5 +1,5 @@
 fn main() {
-    #[cfg(not(feature = "dox"))]
+    #[cfg(not(docsrs))]
     if let Err(s) = system_deps::Config::new().probe() {
         println!("cargo:warning={s}");
         std::process::exit(1);
diff --git a/rust/composefs/Cargo.toml b/rust/composefs/Cargo.toml
index aeb6e07..fcf8e3a 100644
--- a/rust/composefs/Cargo.toml
+++ b/rust/composefs/Cargo.toml
@@ -9,12 +9,16 @@ repository = "https://github.com/containers/composefs"
 rust-version = "1.70.0"
 readme = "README.md"
 
+[package.metadata.docs.rs]
+all-features = true
+rustc-args = ["--cfg", "docsrs"]
+rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
+
 [lib]
 name = "composefs"
 path = "src/lib.rs"
 
 [features]
-dox = ["composefs-sys/dox"]
 # Depend on 1.0.4 APIs
 v1_0_4 = ["composefs-sys/v1_0_4"]