Merge pull request #353 from cgwalters/another-docsrs

rust: Another attempt to fix docs.rs build
containers · Sep 20, 2024 · bc4dd1a · bc4dd1a
2 parents dfd76bb + d7f4774
commit bc4dd1a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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"]