Add tests for mkDummySrc

* Also fix a bug with copying over .cargo/config files

checks/default.nix

@@ -66,6 +66,8 @@ onlyDrvs (lib.makeScope myLib.newScope (self:
       touch $out
     '';
 
+    mkDummySrcTests = callPackage ./mkDummySrcTests { };
+
     simple = myLib.buildPackage {
       src = ./simple;
     };

checks/mkDummySrcTests/default.nix

@@ -0,0 +1,21 @@
+{ linkFarmFromDrvs
+, mkDummySrc
+, runCommand
+}:
+
+let
+  cmpDummySrc = name: path:
+    let
+      dummySrc = mkDummySrc {
+        src = path + /input;
+      };
+    in
+    runCommand "compare-${name}" { } ''
+      diff -r ${path + /expected} ${dummySrc}
+      touch $out
+    '';
+in
+linkFarmFromDrvs "cleanCargoToml" [
+  (cmpDummySrc "single" ./single)
+  (cmpDummySrc "single-alt" ./single-alt)
+]

checks/mkDummySrcTests/single-alt/expected/.cargo/config

@@ -0,0 +1,2 @@
+[alias]
+b = "build"

checks/mkDummySrcTests/single-alt/expected/Cargo.lock

@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "mkDummySrcSimple"
+version = "0.1.0"

checks/mkDummySrcTests/single-alt/expected/Cargo.toml

@@ -0,0 +1,8 @@
+[lib]
+name = "foo"
+path = "src/custom.rs"
+
+[package]
+edition = "2021"
+name = "mkDummySrcSimple"
+version = "0.1.0"

checks/mkDummySrcTests/single-alt/expected/build.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single-alt/expected/src/custom.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single-alt/expected/src/main.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single-alt/input/.cargo/config

@@ -0,0 +1,2 @@
+[alias]
+b = "build"

checks/mkDummySrcTests/single-alt/input/.cargo/config.toml

@@ -0,0 +1,2 @@
+[alias]
+b = "build"

checks/mkDummySrcTests/single-alt/input/Cargo.lock

@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "mkDummySrcSimple"
+version = "0.1.0"

checks/mkDummySrcTests/single-alt/input/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "mkDummySrcSimple"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "foo"
+path = "src/custom.rs"

checks/mkDummySrcTests/single-alt/input/src/custom.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("Hello, world!");
+}
+

checks/mkDummySrcTests/single/expected/.cargo/config

@@ -0,0 +1,2 @@
+[alias]
+b = "build"

checks/mkDummySrcTests/single/expected/Cargo.lock

@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "mkDummySrcSimple"
+version = "0.1.0"

checks/mkDummySrcTests/single/expected/Cargo.toml

@@ -0,0 +1,35 @@
+[lib]
+name = "foo"
+
+[package]
+edition = "2021"
+name = "mkDummySrcSimple"
+version = "0.1.0"
+
+[[bench]]
+name = "bench1"
+
+[[bench]]
+name = "bench2"
+path = "benches/custom.rs"
+
+[[bin]]
+name = "bin1"
+
+[[bin]]
+name = "bin2"
+path = "src/bin/custom.rs"
+
+[[example]]
+name = "example1"
+
+[[example]]
+name = "example2"
+path = "examples/custom.rs"
+
+[[test]]
+name = "test1"
+
+[[test]]
+name = "test2"
+path = "tests/custom.rs"

checks/mkDummySrcTests/single/expected/benches/bench1.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/expected/benches/custom.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/expected/build.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/expected/examples/custom.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/expected/examples/example1.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/expected/src/bin/bin1.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/expected/src/bin/custom.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/expected/src/lib.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/expected/src/main.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/expected/tests/custom.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/expected/tests/test1.rs

@@ -0,0 +1,2 @@
+#![allow(dead_code)]
+pub fn main() {}

checks/mkDummySrcTests/single/input/.cargo/config

@@ -0,0 +1,2 @@
+[alias]
+b = "build"

checks/mkDummySrcTests/single/input/Cargo.lock

@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "mkDummySrcSimple"
+version = "0.1.0"

checks/mkDummySrcTests/single/input/Cargo.toml

@@ -0,0 +1,35 @@
+[package]
+name = "mkDummySrcSimple"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "foo"
+
+[[bin]]
+name = "bin1"
+
+[[bin]]
+name = "bin2"
+path = "src/bin/custom.rs"
+
+[[example]]
+name = "example1"
+
+[[example]]
+name = "example2"
+path = "examples/custom.rs"
+
+[[test]]
+name = "test1"
+
+[[test]]
+name = "test2"
+path = "tests/custom.rs"
+
+[[bench]]
+name = "bench1"
+
+[[bench]]
+name = "bench2"
+path = "benches/custom.rs"

checks/mkDummySrcTests/single/input/benches/bench1.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("Hello, world!");
+}
+

checks/mkDummySrcTests/single/input/benches/custom.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("Hello, world!");
+}
+

checks/mkDummySrcTests/single/input/examples/custom.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("Hello, world!");
+}
+

checks/mkDummySrcTests/single/input/examples/example1.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("Hello, world!");
+}
+

checks/mkDummySrcTests/single/input/src/bin/bin1.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("Hello, world!");
+}
+

checks/mkDummySrcTests/single/input/src/bin/custom.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("Hello, world!");
+}
+

checks/mkDummySrcTests/single/input/src/lib.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("Hello, world!");
+}
+

checks/mkDummySrcTests/single/input/tests/custom.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("Hello, world!");
+}
+

checks/mkDummySrcTests/single/input/tests/test1.rs

@@ -0,0 +1,4 @@
+fn main() {
+    println!("Hello, world!");
+}
+

lib/mkDummySrc.nix

@@ -35,9 +35,9 @@ let
     # the .toml extension is preferred, but the extension-less path takes precedence
     # https://doc.rust-lang.org/cargo/reference/config.html
     if pathExists cargoConfig
-    then "cp ${cargoConfig} $out/.cargo"
+    then "cp ${cargoConfig} $out/.cargo/config"
     else if pathExists cargoConfigToml
-    then "cp ${cargoConfigToml} $out/.cargo"
+    then "cp ${cargoConfigToml} $out/.cargo/config.toml"
     else "";
 
   cpDummy = path: ''