Update krates (#649)

Updates krates to 0.16.10 to fix a bug originally filed on this repo, EmbarkStudios/krates#82. This bug meant that depending on the same crate multiple times by using different ``cfg()` expressions could cause crates that were pulled in by features to not be properly appended to the graph, and thus not checked by cargo-deny.
EmbarkStudios · Apr 12, 2024 · d3021f6 · d3021f6
1 parent 8e4d61e
commit d3021f6
Show file tree

Hide file tree

Showing 8 changed files with 1,565 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/bans.rs b/tests/bans.rs
@@ -217,3 +217,57 @@ deny = [
 
     insta::assert_json_snapshot!(diags);
 }
+
+// Ensures that dependencies brought in by target specific features are banned
+#[test]
+fn deny_target_specific_dependencies() {
+    let diags = gather_bans(
+        func_name!(),
+        KrateGather {
+            name: "features",
+            no_default_features: true,
+            ..Default::default()
+        },
+        r#"
+deny = [
+    'serde'
+]
+"#,
+    );
+
+    insta::assert_json_snapshot!(diags);
+
+    let diags = gather_bans(
+        func_name!(),
+        KrateGather {
+            name: "features",
+            no_default_features: true,
+            targets: &["x86_64-windows-pc-msvc"],
+            ..Default::default()
+        },
+        r#"
+deny = [
+    'serde'
+]
+"#,
+    );
+
+    insta::assert_json_snapshot!(diags);
+
+    let diags = gather_bans(
+        func_name!(),
+        KrateGather {
+            name: "features",
+            no_default_features: true,
+            targets: &["x86_64-windows-pc-msvc", "aarch64-linux-android"],
+            ..Default::default()
+        },
+        r#"
+deny = [
+    'serde'
+]
+"#,
+    );
+
+    insta::assert_json_snapshot!(diags);
+}
diff --git a/tests/snapshots/bans__deny_target_specific_dependencies-2.snap b/tests/snapshots/bans__deny_target_specific_dependencies-2.snap
@@ -0,0 +1,5 @@
+---
+source: tests/bans.rs
+expression: diags
+---
+[]
diff --git a/tests/snapshots/bans__deny_target_specific_dependencies-3.snap b/tests/snapshots/bans__deny_target_specific_dependencies-3.snap
@@ -0,0 +1,46 @@
+---
+source: tests/bans.rs
+expression: diags
+---
+[
+  {
+    "fields": {
+      "code": "banned",
+      "graphs": [
+        {
+          "Krate": {
+            "name": "serde",
+            "version": "1.0.197"
+          },
+          "parents": [
+            {
+              "Krate": {
+                "name": "smallvec",
+                "version": "1.13.2"
+              },
+              "parents": [
+                {
+                  "Krate": {
+                    "name": "features",
+                    "version": "0.1.0"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ],
+      "labels": [
+        {
+          "column": 6,
+          "line": 3,
+          "message": "banned here",
+          "span": "serde"
+        }
+      ],
+      "message": "crate 'serde = 1.0.197' is explicitly banned",
+      "severity": "error"
+    },
+    "type": "diagnostic"
+  }
+]
diff --git a/tests/snapshots/bans__deny_target_specific_dependencies.snap b/tests/snapshots/bans__deny_target_specific_dependencies.snap
@@ -0,0 +1,46 @@
+---
+source: tests/bans.rs
+expression: diags
+---
+[
+  {
+    "fields": {
+      "code": "banned",
+      "graphs": [
+        {
+          "Krate": {
+            "name": "serde",
+            "version": "1.0.197"
+          },
+          "parents": [
+            {
+              "Krate": {
+                "name": "smallvec",
+                "version": "1.13.2"
+              },
+              "parents": [
+                {
+                  "Krate": {
+                    "name": "features",
+                    "version": "0.1.0"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ],
+      "labels": [
+        {
+          "column": 6,
+          "line": 3,
+          "message": "banned here",
+          "span": "serde"
+        }
+      ],
+      "message": "crate 'serde = 1.0.197' is explicitly banned",
+      "severity": "error"
+    },
+    "type": "diagnostic"
+  }
+]
diff --git a/tests/snapshots/licenses__clarifications.snap b/tests/snapshots/licenses__clarifications.snap
@@ -598,6 +598,28 @@ expression: diags
             "version": "1.16.0"
           },
           "parents": [
+            {
+              "Krate": {
+                "name": "ring",
+                "version": "0.16.20"
+              },
+              "parents": [
+                {
+                  "Krate": {
+                    "name": "rustls-webpki",
+                    "version": "0.100.1"
+                  },
+                  "parents": [
+                    {
+                      "Krate": {
+                        "name": "license-clarification",
+                        "version": "0.1.0"
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
             {
               "Krate": {
                 "name": "wasm-bindgen-backend",
@@ -639,22 +661,7 @@ expression: diags
                                         "name": "ring",
                                         "version": "0.16.20"
                                       },
-                                      "parents": [
-                                        {
-                                          "Krate": {
-                                            "name": "rustls-webpki",
-                                            "version": "0.100.1"
-                                          },
-                                          "parents": [
-                                            {
-                                              "Krate": {
-                                                "name": "license-clarification",
-                                                "version": "0.1.0"
-                                              }
-                                            }
-                                          ]
-                                        }
-                                      ]
+                                      "repeat": true
                                     }
                                   ]
                                 }