Update supply

Cargo.toml

@@ -21,8 +21,8 @@ assert_cmd = "2.2"
 cargo_metadata = "0.23"
 serde = "1.0"
 serde_json = "1.0"
-similar-asserts = "2.0"
 snapbox = "1.2"
+supply_chain = "0.1"
 
 [lints.clippy]
 pedantic = { level = "warn", priority = -1 }

tests/integration/ci.rs

@@ -2,14 +2,7 @@ use crate::util;
 use assert_cmd::assert::OutputAssertExt;
 use cargo_metadata::MetadataCommand;
 use regex::Regex;
-use similar_asserts::SimpleDiff;
-use std::{
-    env::var,
-    fs::{read_to_string, write},
-    path::Path,
-    process::{Command, ExitStatus},
-    str::FromStr,
-};
+use std::{fs::read_to_string, path::Path, process::Command};
 
 #[test]
 fn clippy() {
@@ -100,57 +93,5 @@ fn readme_reference_links_are_used() {
 
 #[test]
 fn supply_chain() {
-    let mut command = Command::new("cargo");
-    command.args(["supply-chain", "update", "--cache-max-age=0s"]);
-    let _: ExitStatus = command.status().unwrap();
-
-    let mut command = Command::new("cargo");
-    command.args(["supply-chain", "json", "--no-dev"]);
-    let assert = command.assert().success();
-
-    let stdout_actual = std::str::from_utf8(&assert.get_output().stdout).unwrap();
-    let mut value = serde_json::Value::from_str(stdout_actual).unwrap();
-    remove_avatars(&mut value);
-    let stdout_normalized = serde_json::to_string_pretty(&value).unwrap();
-
-    let path_buf = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/supply_chain.json");
-
-    if enabled("BLESS") {
-        write(path_buf, stdout_normalized).unwrap();
-    } else {
-        let stdout_expected = read_to_string(&path_buf).unwrap();
-
-        assert!(
-            stdout_expected == stdout_normalized,
-            "{}",
-            SimpleDiff::from_str(&stdout_expected, &stdout_normalized, "left", "right")
-        );
-    }
-}
-
-fn remove_avatars(value: &mut serde_json::Value) {
-    match value {
-        serde_json::Value::Null
-        | serde_json::Value::Bool(_)
-        | serde_json::Value::Number(_)
-        | serde_json::Value::String(_) => {}
-        serde_json::Value::Array(array) => {
-            for value in array {
-                remove_avatars(value);
-            }
-        }
-        serde_json::Value::Object(object) => {
-            object.retain(|key, value| {
-                if key == "avatar" {
-                    return false;
-                }
-                remove_avatars(value);
-                true
-            });
-        }
-    }
-}
-
-fn enabled(key: &str) -> bool {
-    var(key).is_ok_and(|value| value != "0")
+    supply_chain::check("tests/supply_chain.json");
 }

tests/supply_chain.json

@@ -17,17 +17,17 @@
       }
     ],
     "bitflags": [
-      {
-        "id": 51,
-        "kind": "team",
-        "login": "github:rust-lang-nursery:libs",
-        "name": "libs"
-      },
       {
         "id": 3204,
         "kind": "user",
         "login": "KodrAus",
         "name": "Ashley Mannix"
+      },
+      {
+        "id": 55123,
+        "kind": "user",
+        "login": "rust-lang-owner",
+        "name": null
       }
     ],
     "cfg-if": [
@@ -125,12 +125,6 @@
       }
     ],
     "home": [
-      {
-        "id": 6202,
-        "kind": "user",
-        "login": "ehuss",
-        "name": "Eric Huss"
-      },
       {
         "id": 11164,
         "kind": "user",
@@ -453,12 +447,6 @@
       }
     ],
     "toml": [
-      {
-        "id": 6202,
-        "kind": "user",
-        "login": "ehuss",
-        "name": "Eric Huss"
-      },
       {
         "id": 6743,
         "kind": "user",