Enable dependencies based on dep: features

crate2nix/Cargo.nix

@@ -2900,7 +2900,7 @@ rec {
       len = builtins.stringLength prefix;
       startsWithPrefix = builtins.substring 0 len feature == prefix;
     in
-    feature == name || startsWithPrefix;
+    feature == name || feature == "dep:" + name || startsWithPrefix;
 
   /* Returns the expanded features for the given inputFeatures by applying the
     rules in featureMap.

crate2nix/templates/nix/crate2nix/default.nix

@@ -571,7 +571,7 @@ rec {
       len = builtins.stringLength prefix;
       startsWithPrefix = builtins.substring 0 len feature == prefix;
     in
-    feature == name || startsWithPrefix;
+    feature == name || feature == "dep:" + name || startsWithPrefix;
 
   /* Returns the expanded features for the given inputFeatures by applying the
     rules in featureMap.

sample_projects/bin_with_dep_features/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "bin_with_dep_features"
+version = "0.1.0"
+authors = ["Faye Duxovni <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+"hello_world_lib" = { path = "../lib", optional = true }
+
+[features]
+default = ["use_lib"]
+use_lib = ["dep:hello_world_lib"]

sample_projects/bin_with_dep_features/src/main.rs

@@ -0,0 +1,7 @@
+#[cfg(feature = "use_lib")]
+use renamed_hello_world_lib;
+
+fn main() {
+    #[cfg(feature = "use_lib")]
+    renamed_hello_world_lib::hello_world("bin_with_dep_features");
+}

sample_projects/bin_with_git_branch_dep/Cargo.nix

@@ -680,7 +680,7 @@ rec {
       len = builtins.stringLength prefix;
       startsWithPrefix = builtins.substring 0 len feature == prefix;
     in
-    feature == name || startsWithPrefix;
+    feature == name || feature == "dep:" + name || startsWithPrefix;
 
   /* Returns the expanded features for the given inputFeatures by applying the
     rules in featureMap.

sample_projects/bin_with_git_submodule_dep/Cargo.nix

@@ -1915,7 +1915,7 @@ rec {
       len = builtins.stringLength prefix;
       startsWithPrefix = builtins.substring 0 len feature == prefix;
     in
-    feature == name || startsWithPrefix;
+    feature == name || feature == "dep:" + name || startsWithPrefix;
 
   /* Returns the expanded features for the given inputFeatures by applying the
     rules in featureMap.

sample_projects/codegen/Cargo.nix

@@ -1047,7 +1047,7 @@ rec {
       len = builtins.stringLength prefix;
       startsWithPrefix = builtins.substring 0 len feature == prefix;
     in
-    feature == name || startsWithPrefix;
+    feature == name || feature == "dep:" + name || startsWithPrefix;
 
   /* Returns the expanded features for the given inputFeatures by applying the
     rules in featureMap.

sample_projects/sub_dir_crates/Cargo.nix

@@ -699,7 +699,7 @@ rec {
       len = builtins.stringLength prefix;
       startsWithPrefix = builtins.substring 0 len feature == prefix;
     in
-    feature == name || startsWithPrefix;
+    feature == name || feature == "dep:" + name || startsWithPrefix;
 
   /* Returns the expanded features for the given inputFeatures by applying the
     rules in featureMap.

tests.nix

@@ -214,6 +214,13 @@ let
       expectedOutput = "Hello, bin_with_rerenamed_lib_dep!";
     }
 
+    {
+      name = "bin_with_dep_features";
+      src = ./sample_projects;
+      cargoToml = "bin_with_dep_features/Cargo.toml";
+      expectedOutput = "Hello, bin_with_dep_features!";
+    }
+
     {
       name = "sub_dir_crates";
       src = ./sample_projects/sub_dir_crates;