Merge branch 'master' into cyclic-dep-fix

cargo-auditable/Cargo.toml

@@ -15,7 +15,7 @@ readme = "../README.md"
 [dependencies]
 object = {version = "0.30", default-features = false, features = ["write"]}
 auditable-serde = {version = "0.6.0", path = "../auditable-serde", features = ["from_metadata"]}
-miniz_oxide = {version = "0.5.0"}
+miniz_oxide = {version = "0.6.0"}
 serde_json = "1.0.57"
 cargo_metadata = "0.15"
 pico-args = "0.5"

cargo-auditable/tests/fixtures/custom_rustc_path/Cargo.toml

@@ -0,0 +1,7 @@
+[workspace]
+
+members = [
+    "top_level_crate",
+    "runtime_dep",
+    "build_dep_of_runtime_dep",
+]

cargo-auditable/tests/fixtures/custom_rustc_path/build_dep_of_runtime_dep/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "build_dep_of_runtime_dep"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

cargo-auditable/tests/fixtures/custom_rustc_path/build_dep_of_runtime_dep/src/lib.rs

@@ -0,0 +1,8 @@
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        let result = 2 + 2;
+        assert_eq!(result, 4);
+    }
+}

cargo-auditable/tests/fixtures/custom_rustc_path/runtime_dep/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "runtime_dep"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[build-dependencies]
+build_dep_of_runtime_dep = {path = "../build_dep_of_runtime_dep"}

cargo-auditable/tests/fixtures/custom_rustc_path/runtime_dep/src/lib.rs

@@ -0,0 +1,8 @@
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        let result = 2 + 2;
+        assert_eq!(result, 4);
+    }
+}

cargo-auditable/tests/fixtures/custom_rustc_path/top_level_crate/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "top_level_crate"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+runtime_dep = {path = "../runtime_dep"}

cargo-auditable/tests/fixtures/custom_rustc_path/top_level_crate/src/main.rs

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

cargo-auditable/tests/it.rs

@@ -366,7 +366,7 @@ fn test_runtime_then_build_dep() {
 fn test_custom_rustc_path() {
     // Path to workspace fixture Cargo.toml. See that file for overview of workspace members and their dependencies.
     let workspace_cargo_toml = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .join("tests/fixtures/runtime_then_build_dep/Cargo.toml");
+        .join("tests/fixtures/custom_rustc_path/Cargo.toml");
     // locate rustc
     let rustc_path = which::which("rustc").unwrap();
     // Run in workspace root with a custom path to rustc