Fix deptree_snapshot

Author: coolreader18

crates/bindings/tests/deps.rs

@@ -2,45 +2,12 @@
 //! to make sure we don't unknowingly add a bunch of dependencies here,
 //! slowing down compilation for every spacetime module.
 
-// We need to remove the `cpufeatures` and `libc` dependencies from the output, it added on `arm` architecture:
-// https://github.com/RustCrypto/sponges/blob/master/keccak/Cargo.toml#L24-L25, breaking local testing.
-#[cfg(target_arch = "aarch64")]
-fn hack_keccack(cmd: String) -> String {
-    let mut found = false;
-    let mut lines = cmd.lines().peekable();
-    let mut output = String::new();
-
-    while let Some(line) = lines.next() {
-        // Check we only match keccak/cpufeatures/libc
-        if line.contains("keccak") {
-            found = true;
-        }
-        if found && line.contains("cpufeatures") {
-            if let Some(next_line) = lines.peek() {
-                if next_line.contains("libc") {
-                    found = false;
-                    // Skip libc
-                    lines.next();
-                    continue;
-                }
-            }
-        }
-        output.push_str(line);
-        output.push('\n');
-    }
-
-    output
-}
-#[cfg(not(target_arch = "aarch64"))]
-fn hack_keccack(cmd: String) -> String {
-    cmd
-}
-
 #[test]
 fn deptree_snapshot() -> std::io::Result<()> {
-    let cmd = "cargo tree -p spacetimedb -f {lib} -e no-dev";
-    let deps_tree = hack_keccack(run_cmd(cmd));
-    let all_deps = hack_keccack(run_cmd("cargo tree -p spacetimedb -e no-dev --prefix none --no-dedupe"));
+    let cmd_common = "cargo tree -p spacetimedb -e no-dev --color never --target wasm32-unknown-unknown";
+    let cmd = &format!("{cmd_common} -f {{lib}}");
+    let deps_tree = run_cmd(cmd);
+    let all_deps = run_cmd(&format!("{cmd_common} --prefix none --no-dedupe"));
     let mut all_deps = all_deps.lines().collect::<Vec<_>>();
     all_deps.sort();
     all_deps.dedup();
@@ -52,7 +19,7 @@ fn deptree_snapshot() -> std::io::Result<()> {
         cmd
     );
 
-    let cmd = "cargo tree -p spacetimedb -e no-dev -d --depth 0";
+    let cmd = &format!("{cmd_common} -d --depth 0");
     insta::assert_snapshot!("duplicate_deps", run_cmd(cmd), cmd);
 
     Ok(())

crates/bindings/tests/snapshots/deps__spacetimedb_bindings_dependencies.snap

@@ -1,8 +1,8 @@
 ---
 source: crates/bindings/tests/deps.rs
-expression: "cargo tree -p spacetimedb -f {lib} -e no-dev"
+expression: "cargo tree -p spacetimedb -e no-dev --color never --target wasm32-unknown-unknown -f {lib}"
 ---
-total crates: 66
+total crates: 65
 spacetimedb
 ├── bytemuck
 ├── derive_more
@@ -19,11 +19,9 @@ spacetimedb
 │   └── rustc_version
 │       └── semver
 ├── getrandom
-│   ├── cfg_if
-│   └── libc
+│   └── cfg_if
 ├── log
 ├── rand
-│   ├── libc
 │   ├── rand_chacha
 │   │   ├── ppv_lite86
 │   │   │   └── zerocopy
@@ -44,7 +42,12 @@ spacetimedb
 │   │   └── nohash_hasher
 │   └── syn (*)
 ├── spacetimedb_bindings_sys
-│   └── spacetimedb_primitives (*)
+│   └── spacetimedb_primitives
+│       ├── bitflags
+│       ├── either
+│       ├── itertools
+│       │   └── either
+│       └── nohash_hasher
 ├── spacetimedb_lib
 │   ├── anyhow
 │   ├── bitflags