unity, clarify

Author: drahnr

Cargo.lock

@@ -29,3 +29,4 @@ ignore = "0.4"
 tracing = "0.1"
 build-rs-utils = { path = "../../build-rs-utils" }
 which = "7"
+indexmap = "2"

fendermint/actors-custom-car/Cargo.toml

@@ -19,7 +19,6 @@ use cargo_metadata::{DependencyKind, MetadataCommand};
 use color_eyre::eyre::{bail, eyre, OptionExt, Result};
 use fil_actor_bundler::Bundler;
 use fs_err as fs;
-use std::collections::HashSet;
 use std::io::{BufRead, BufReader};
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
@@ -220,7 +219,7 @@ fn build_all_wasm_blobs(
         .iter()
         .map(|actor| format!("-p={}", actor.package_name));
 
-    echo!("actors-custom-car", purple, "Target: {channel} {target}");
+    echo!("actors-custom-car", purple, "Target: channel={channel} target={target}");
 
     let rustup = which::which("rustup")?;
 
@@ -293,9 +292,9 @@ fn print_cargo_rerun_if_dependency_instructions(
     let cargo_lock = find_cargo_lock(out_dir).ok_or_eyre("Couldn't find Cargo.lock")?;
     rerun_if_changed(&cargo_lock);
 
-    let workspace = cargo_lock.parent().unwrap();
+    let workspace_dir = cargo_lock.parent().expect("A file always should have a parent");
 
-    let metadata = create_metadata_command(workspace.join("Cargo.toml")).exec()?;
+    let metadata = create_metadata_command(workspace_dir.join("Cargo.toml")).exec()?;
 
     let package = metadata
         .packages
@@ -307,7 +306,7 @@ fn print_cargo_rerun_if_dependency_instructions(
     let mut dependencies = Vec::from_iter(package.dependencies.iter());
 
     // Collect all packages by follow the dependencies of all packages we find.
-    let mut packages = HashSet::new();
+    let mut packages = indexmap::IndexSet::new();
     packages.insert(DeduplicatePackage::from(package));
 
     while let Some(dependency) = dependencies.pop() {
@@ -325,7 +324,7 @@ fn print_cargo_rerun_if_dependency_instructions(
         let maybe_package = metadata
             .packages
             .iter()
-            .filter(|p| !p.manifest_path.starts_with(workspace))
+            .filter(|p| !p.manifest_path.starts_with(workspace_dir))
             .find(|p| {
                 // Check that the name matches and that the version matches or this is
                 // a git or path dep. A git or path dependency can only occur once, so we don't