From b1910c0bf709d94e226532a5ccb0ccae87888db5 Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Fri, 19 Jan 2024 22:18:46 +0100
Subject: [PATCH] Patch release (#586)

This fixes 2 bugs that were originally opened on this repo but really
belong to the crate used to create crate graphs:

- https://github.com/EmbarkStudios/krates/issues/60
- https://github.com/EmbarkStudios/krates/issues/64

Resolves: #584
---
 .github/workflows/ci.yaml                     |   1 +
 CHANGELOG.md                                  |   3 +
 Cargo.lock                                    | 671 ++++++++----------
 Cargo.toml                                    |   6 +-
 deny.toml                                     |  10 +-
 docs/src/checks/bans/README.md                |   2 +-
 src/advisories/helpers/db.rs                  |  12 +-
 src/bans.rs                                   |  21 +-
 src/bans/diags.rs                             |   2 +-
 src/cargo-deny/list.rs                        | 103 +--
 src/cargo-deny/main.rs                        |  15 +-
 src/diag.rs                                   |  35 +-
 src/lib.rs                                    |   6 +-
 src/sources.rs                                |  24 +-
 .../sources__allows_bitbucket_org.snap        |  12 +-
 tests/snapshots/sources__allows_git.snap      |  12 +-
 .../snapshots/sources__allows_github_org.snap |  12 +-
 .../snapshots/sources__allows_gitlab_org.snap |  12 +-
 .../snapshots/sources__fails_unknown_git.snap |  12 +-
 19 files changed, 445 insertions(+), 526 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4521a107e..339778536 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -73,6 +73,7 @@ jobs:
 
   self:
     name: Check Users
+    if: false # disabled for now
     strategy:
       matrix:
         include:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcf23ad1e..d3fdc0c01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+### Fixed
+- [PR#586](https://github.com/EmbarkStudios/cargo-deny/pull/586) resolved 2 issues with crate graph creation, see [krates#60](https://github.com/EmbarkStudios/krates/issues/60) and [krates#64](https://github.com/EmbarkStudios/krates/issues/64) for more details.
+
 ## [0.14.3] - 2023-09-29
 ### Fixed
 - [PR#566](https://github.com/EmbarkStudios/cargo-deny/pull/566) updated `tame-index` to obtain support OS file locking, resolving [#537](https://github.com/EmbarkStudios/cargo-deny/issues/537). This change means that cargo-deny should not encounter issues such as those described [here](https://github.com/rustsec/rustsec/issues/1011) since we no longer use `gix::lock` locking advisory databases, and makes reading the crates.io index safer by respecting the lock used by cargo itself.
diff --git a/Cargo.lock b/Cargo.lock
index b8b503909..4a9886cab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,9 +28,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.5"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -76,9 +76,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
 [[package]]
 name = "arc-swap"
@@ -107,9 +107,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5"
+checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c"
 dependencies = [
  "flate2",
  "futures-core",
@@ -141,9 +141,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "bitflags"
@@ -153,9 +153,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "bitvec"
@@ -180,9 +180,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
+checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc"
 dependencies = [
  "memchr",
  "regex-automata",
@@ -281,18 +281,18 @@ dependencies = [
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff"
+checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cargo_metadata"
-version = "0.17.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
 dependencies = [
  "camino",
  "cargo-platform",
@@ -314,9 +314,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.5"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3"
+checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -330,9 +330,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.11"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -340,9 +340,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.11"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
 dependencies = [
  "anstream",
  "anstyle",
@@ -359,7 +359,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -401,14 +401,14 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -429,9 +429,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
@@ -447,11 +447,10 @@ dependencies = [
 
 [[package]]
 name = "crossbeam"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
 dependencies = [
- "cfg-if",
  "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-epoch",
@@ -461,56 +460,46 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.8"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
- "memoffset",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.8"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crypto-common"
@@ -533,9 +522,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
 ]
@@ -593,15 +582,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "faster-hex"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "faster-hex"
 version = "0.9.0"
@@ -692,42 +672,42 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-core",
  "futures-io",
@@ -750,9 +730,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -767,9 +747,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "gix"
-version = "0.56.0"
+version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0dcdc9c60d66535897fa40a7ea2a635e72f99456b1d9ae86b7e170e80618cb"
+checksum = "6dd025382892c7b500a9ce1582cd803f9c2ebfe44aff52e9c7f86feee7ced75e"
 dependencies = [
  "gix-actor",
  "gix-attributes",
@@ -824,9 +804,9 @@ dependencies = [
 
 [[package]]
 name = "gix-actor"
-version = "0.28.1"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417"
+checksum = "da27b5ab4ab5c75ff891dccd48409f8cc53c28a79480f1efdd33184b2dc1d958"
 dependencies = [
  "bstr",
  "btoi",
@@ -838,9 +818,9 @@ dependencies = [
 
 [[package]]
 name = "gix-attributes"
-version = "0.20.1"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f395469d38c76ec47cd1a6c5a53fbc3f13f737b96eaf7535f4e6b367e643381"
+checksum = "bd6de7603d6bcefcf9a1d87779c4812b14665f71bc870df7ce9ca4c4b309de18"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -855,27 +835,27 @@ dependencies = [
 
 [[package]]
 name = "gix-bitmap"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d49e1a13a30d3f88be4bceae184dd13a2d3fb9ffa7515f7ed7ae771b857f4916"
+checksum = "78b6cd0f246180034ddafac9b00a112f19178135b21eb031b3f79355891f7325"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-chunk"
-version = "0.4.5"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d411ecd9b558b0c20b3252b7e409eec48eabc41d18324954fe526bac6e2db55f"
+checksum = "003ec6deacf68076a0c157271a127e0bb2c031c1a41f7168cbe5d248d9b85c78"
 dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "gix-command"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3b54c1d8d63e6ef2adbd9b94d6e49ff168858510b44d3811cdd02dfacc4f0c9"
+checksum = "deefa783a418ceb5ae88d0701ab110efaec2df398f4520d90529dec543e48467"
 dependencies = [
  "bstr",
  "gix-path",
@@ -885,9 +865,9 @@ dependencies = [
 
 [[package]]
 name = "gix-commitgraph"
-version = "0.22.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a7007ba021f059803afaf6f8a48872422abc20550ac12ede6ddea2936cec36"
+checksum = "7e8dcbf434951fa477063e05fea59722615af70dc2567377e58c2f7853b010fc"
 dependencies = [
  "bstr",
  "gix-chunk",
@@ -899,9 +879,9 @@ dependencies = [
 
 [[package]]
 name = "gix-config"
-version = "0.32.1"
+version = "0.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0341471d55d8676e98b88e121d7065dfa4c9c5acea4b6d6ecdd2846e85cce0c3"
+checksum = "367304855b369cadcac4ee5fb5a3a20da9378dd7905106141070b79f85241079"
 dependencies = [
  "bstr",
  "gix-config-value",
@@ -920,11 +900,11 @@ dependencies = [
 
 [[package]]
 name = "gix-config-value"
-version = "0.14.1"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6419db582ea84dfb58c7e7b0af7fd62c808aa14954af2936a33f89b0f4ed018e"
+checksum = "52e0be46f4cf1f8f9e88d0e3eb7b29718aff23889563249f379119bd1ab6910e"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "bstr",
  "gix-path",
  "libc",
@@ -933,9 +913,9 @@ dependencies = [
 
 [[package]]
 name = "gix-credentials"
-version = "0.22.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "513dac42450b27946bd0a0535a3a5a88e473d6522e5e3439a129cab779c88f3d"
+checksum = "380cf3a7c31763743ae6403ec473281d54bfa05628331d09518a350ad5a0971f"
 dependencies = [
  "bstr",
  "gix-command",
@@ -950,9 +930,9 @@ dependencies = [
 
 [[package]]
 name = "gix-date"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "468dfbe411f335f01525a1352271727f8e7772075a93fa747260f502086b30be"
+checksum = "fb7f3dfb72bebe3449b5e642be64e3c6ccbe9821c8b8f19f487cf5bfbbf4067e"
 dependencies = [
  "bstr",
  "itoa",
@@ -962,9 +942,9 @@ dependencies = [
 
 [[package]]
 name = "gix-diff"
-version = "0.38.0"
+version = "0.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8119a985887cfe68f4bdf92e51bd64bc758a73882d82fcfc03ebcb164441c85d"
+checksum = "fd6a0454f8c42d686f17e7f084057c717c082b7dbb8209729e4e8f26749eb93a"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -974,9 +954,9 @@ dependencies = [
 
 [[package]]
 name = "gix-discover"
-version = "0.27.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fad89416ebe0b3b7df78464124e2a02417b6cd3743d48ad93df86f4d2929c07"
+checksum = "b8d7b2896edc3d899d28a646ccc6df729827a6600e546570b2783466404a42d6"
 dependencies = [
  "bstr",
  "dunce",
@@ -989,9 +969,9 @@ dependencies = [
 
 [[package]]
 name = "gix-features"
-version = "0.36.1"
+version = "0.37.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2"
+checksum = "d50270e8dcc665f30ba0735b17984b9535bdf1e646c76e638e007846164d57af"
 dependencies = [
  "bytes",
  "crc32fast",
@@ -1008,9 +988,9 @@ dependencies = [
 
 [[package]]
 name = "gix-filter"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d6a5c9d8e55c364e7c226919c19c9a28be1392d6208b5008059fa94ff7e2bf0"
+checksum = "f598c1d688bf9d57f428ed7ee70c3e786d6f0cc7ed1aeb3c982135af41f6e516"
 dependencies = [
  "bstr",
  "encoding_rs",
@@ -1029,20 +1009,20 @@ dependencies = [
 
 [[package]]
 name = "gix-fs"
-version = "0.8.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107"
+checksum = "7555c23a005537434bbfcb8939694e18cad42602961d0de617f8477cc2adecdd"
 dependencies = [
  "gix-features",
 ]
 
 [[package]]
 name = "gix-glob"
-version = "0.14.1"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19"
+checksum = "ae6232f18b262770e343dcdd461c0011c9b9ae27f0c805e115012aa2b902c1b8"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "bstr",
  "gix-features",
  "gix-path",
@@ -1050,19 +1030,19 @@ dependencies = [
 
 [[package]]
 name = "gix-hash"
-version = "0.13.3"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0"
+checksum = "b0ed89cdc1dce26685c80271c4287077901de3c3dd90234d5fa47c22b2268653"
 dependencies = [
- "faster-hex 0.9.0",
+ "faster-hex",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-hashtable"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca"
+checksum = "ebe47d8c0887f82355e2e9e16b6cecaa4d5e5346a7a474ca78ff94de1db35a5b"
 dependencies = [
  "gix-hash",
  "hashbrown",
@@ -1071,9 +1051,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ignore"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a215cc8cf21645bca131fcf6329d3ebd46299c47dbbe27df71bb1ca9e328b879"
+checksum = "f356ce440c60aedb7e72f3447f352f9c5e64352135c8cf33e838f49760fd2643"
 dependencies = [
  "bstr",
  "gix-glob",
@@ -1083,11 +1063,11 @@ dependencies = [
 
 [[package]]
 name = "gix-index"
-version = "0.27.1"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f308f5cd2992e96a274b0d1931e9a0e44fdcba87695ead3f6df30d8a697e9c"
+checksum = "9e50e63df6c8d4137f7fb882f27643b3a9756c468a1a2cdbe1ce443010ca8778"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "bstr",
  "btoi",
  "filetime",
@@ -1108,9 +1088,9 @@ dependencies = [
 
 [[package]]
 name = "gix-lock"
-version = "11.0.1"
+version = "12.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5c65e6a29830a435664891ced3f3c1af010f14900226019590ee0971a22f37"
+checksum = "f40a439397f1e230b54cf85d52af87e5ea44cc1e7748379785d3f6d03d802b00"
 dependencies = [
  "gix-tempfile",
  "gix-utils",
@@ -1119,22 +1099,22 @@ dependencies = [
 
 [[package]]
 name = "gix-macros"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02a5bcaf6704d9354a3071cede7e77d366a5980c7352e102e2c2f9b645b1d3ae"
+checksum = "d75e7ab728059f595f6ddc1ad8771b8d6a231971ae493d9d5948ecad366ee8bb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "gix-negotiate"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "979f6accd9c051b3dd018b50adf29c0a2459edddf6105cc70b767976cd6f8014"
+checksum = "e6820bb5e9e259f6ad052826037452ca023d4f248c5d710dce067d89685dd582"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "gix-commitgraph",
  "gix-date",
  "gix-hash",
@@ -1146,9 +1126,9 @@ dependencies = [
 
 [[package]]
 name = "gix-object"
-version = "0.39.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "febf79c5825720c1c63fe974c7bbe695d0cb54aabad73f45671c60ce0e501e33"
+checksum = "0c89402e8faa41b49fde348665a8f38589e461036475af43b6b70615a6a313a2"
 dependencies = [
  "bstr",
  "btoi",
@@ -1165,9 +1145,9 @@ dependencies = [
 
 [[package]]
 name = "gix-odb"
-version = "0.55.0"
+version = "0.56.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fae5f971540c99c6ecc8d4368ecc9d18a9dc8b9391025c68c4399747dc93bac"
+checksum = "46ae6da873de41c6c2b73570e82c571b69df5154dcd8f46dfafc6687767c33b1"
 dependencies = [
  "arc-swap",
  "gix-date",
@@ -1184,9 +1164,9 @@ dependencies = [
 
 [[package]]
 name = "gix-pack"
-version = "0.45.0"
+version = "0.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569491c92446fddf373456ff360aff9a9effd627b40a70f2d7914dcd75a3205"
+checksum = "782b4d42790a14072d5c400deda9851f5765f50fe72bca6dece0da1cd6f05a9a"
 dependencies = [
  "clru",
  "gix-chunk",
@@ -1204,33 +1184,33 @@ dependencies = [
 
 [[package]]
 name = "gix-packetline"
-version = "0.17.0"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b9fcc4425bd64c585440d14e5d2405a399f323429401571ba56a2c6d111865"
+checksum = "f894634991382500b9c701550e2b4f64c411d5582adbebcc748a4511feb4356d"
 dependencies = [
  "bstr",
- "faster-hex 0.8.1",
+ "faster-hex",
  "gix-trace",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-packetline-blocking"
-version = "0.17.0"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50052c0f76c5af5acda41177fb55b60c1e484cc246ae919d8d21129cd1000a4e"
+checksum = "c67ed1571267cc92ee64ab3e39eeaef46e5fc690bac9d12f1ddd1b1331be10dc"
 dependencies = [
  "bstr",
- "faster-hex 0.8.1",
+ "faster-hex",
  "gix-trace",
  "thiserror",
 ]
 
 [[package]]
 name = "gix-path"
-version = "0.10.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d86d6fac2fabe07b67b7835f46d07571f68b11aa1aaecae94fe722ea4ef305e1"
+checksum = "b8dd0998ab245f33d40ca2267e58d542fe54185ebd1dc41923346cf28d179fb6"
 dependencies = [
  "bstr",
  "gix-trace",
@@ -1241,11 +1221,11 @@ dependencies = [
 
 [[package]]
 name = "gix-pathspec"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dbbb92f75a38ef043c8bb830b339b38d0698d7f3746968b5fcbade7a880494d"
+checksum = "0cdb0ee9517c04f89bcaf6366fe893a17154ecb02d88b5c8174f27f1091d1247"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "bstr",
  "gix-attributes",
  "gix-config-value",
@@ -1256,9 +1236,9 @@ dependencies = [
 
 [[package]]
 name = "gix-prompt"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4967b921304a5355e65a6257280eddf6e0f9ce3df111256531460adca3771305"
+checksum = "02bd89d058258e53e0fd6c57f13ee16c5673a83066a68e11f88626fc8cfda5f6"
 dependencies = [
  "gix-command",
  "gix-config-value",
@@ -1269,9 +1249,9 @@ dependencies = [
 
 [[package]]
 name = "gix-protocol"
-version = "0.42.0"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95736ef407db0bd15a5bdea791fbfcf523b9f13b96c852c240cd86a9ee0ef817"
+checksum = "eca52738435991105f3bbd7f3a3a42cdf84c9992a78b9b7b1de528b3c022cfdd"
 dependencies = [
  "bstr",
  "btoi",
@@ -1287,9 +1267,9 @@ dependencies = [
 
 [[package]]
 name = "gix-quote"
-version = "0.4.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f84845efa535468bc79c5a87b9d29219f1da0313c8ecf0365a5daa7e72786f2"
+checksum = "9f7dc10303d73a960d10fb82f81188b036ac3e6b11b5795b20b1a60b51d1321f"
 dependencies = [
  "bstr",
  "btoi",
@@ -1298,9 +1278,9 @@ dependencies = [
 
 [[package]]
 name = "gix-ref"
-version = "0.39.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac23ed741583c792f573c028785db683496a6dfcd672ec701ee54ba6a77e1ff"
+checksum = "64d9bd1984638d8f3511a2fcbe84fcedb8a5b5d64df677353620572383f42649"
 dependencies = [
  "gix-actor",
  "gix-date",
@@ -1319,9 +1299,9 @@ dependencies = [
 
 [[package]]
 name = "gix-refspec"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d9d3b82e1ee78fc0dc1c37ea5ea76c2dbc73f407db155f0dfcea285e583bee"
+checksum = "be219df5092c1735abb2a53eccdf775e945eea6986ee1b6e7a5896dccc0be704"
 dependencies = [
  "bstr",
  "gix-hash",
@@ -1333,9 +1313,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revision"
-version = "0.24.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5dd51710ce5434bc315ea30394fab483c5377276494edd79222b321a5a9544"
+checksum = "aa78e1df3633bc937d4db15f8dca2abdb1300ca971c0fabcf9fa97e38cf4cd9f"
 dependencies = [
  "bstr",
  "gix-date",
@@ -1349,9 +1329,9 @@ dependencies = [
 
 [[package]]
 name = "gix-revwalk"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d4ed2493ca94a475fdf147138e1ef8bab3b6ebb56abf3d9bda1c05372ec1dd"
+checksum = "702de5fe5c2bbdde80219f3a8b9723eb927466e7ecd187cfd1b45d986408e45f"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -1364,11 +1344,11 @@ dependencies = [
 
 [[package]]
 name = "gix-sec"
-version = "0.10.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a36ea2c5907d64a9b4b5d3cc9f430e6c30f0509646b5e38eb275ca57c5bf29e2"
+checksum = "78f6dce0c6683e2219e8169aac4b1c29e89540a8262fef7056b31d80d969408c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "gix-path",
  "libc",
  "windows",
@@ -1376,9 +1356,9 @@ dependencies = [
 
 [[package]]
 name = "gix-submodule"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02a3d7f60a95bdcaeb8981663c99d1c9f4de42aab1169524c949e948989809f9"
+checksum = "21d438409222de24dffcc9897f04a9f97903a19fe4835b598ab3bb9b6e0f5e35"
 dependencies = [
  "bstr",
  "gix-config",
@@ -1391,9 +1371,9 @@ dependencies = [
 
 [[package]]
 name = "gix-tempfile"
-version = "11.0.1"
+version = "12.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388dd29114a86ec69b28d1e26d6d63a662300ecf61ab3f4cc578f7d7dc9e7e23"
+checksum = "a8ef376d718b1f5f119b458e21b00fbf576bc9d4e26f8f383d29f5ffe3ba3eaa"
 dependencies = [
  "gix-fs",
  "libc",
@@ -1406,15 +1386,15 @@ dependencies = [
 
 [[package]]
 name = "gix-trace"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b686a35799b53a9825575ca3f06481d0a053a409c4d97ffcf5ddd67a8760b497"
+checksum = "02b202d766a7fefc596e2cc6a89cda8ad8ad733aed82da635ac120691112a9b1"
 
 [[package]]
 name = "gix-transport"
-version = "0.39.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f731cfefc4d62468c6dd2053f5c6707828256a6d2f5488c1811e3f42c178b144"
+checksum = "be01a22053e9395a409fcaeed879d94f4fcffeb4f46de7143275fbf5e5b39770"
 dependencies = [
  "base64",
  "bstr",
@@ -1431,9 +1411,9 @@ dependencies = [
 
 [[package]]
 name = "gix-traverse"
-version = "0.35.0"
+version = "0.36.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2112088122a0206592c84fbd42020db63b2ccaed66a0293779f2e5fbf80474"
+checksum = "65109e445ba7a409b48f34f570a4d7db72eade1dc1bcff81990a490e86c07161"
 dependencies = [
  "gix-commitgraph",
  "gix-date",
@@ -1447,9 +1427,9 @@ dependencies = [
 
 [[package]]
 name = "gix-url"
-version = "0.25.2"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c427a1a11ccfa53a4a2da47d9442c2241deee63a154bc15cc14b8312fbc4005"
+checksum = "8f0f17cceb7552a231d1fec690bc2740c346554e3be6f5d2c41dfa809594dc44"
 dependencies = [
  "bstr",
  "gix-features",
@@ -1461,18 +1441,18 @@ dependencies = [
 
 [[package]]
 name = "gix-utils"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f82c41937f00e15a1f6cb0b55307f0ca1f77f4407ff2bf440be35aa688c6a3e"
+checksum = "de6225e2de30b6e9bca2d9f1cc4731640fcef0fb3cabddceee366e7e85d3e94f"
 dependencies = [
  "fastrand",
 ]
 
 [[package]]
 name = "gix-validate"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b7d8e4274be69f284bbc7e6bb2ccf7065dbcdeba22d8c549f2451ae426883f"
+checksum = "ac7cc36f496bd5d96cdca0f9289bb684480725d40db60f48194aa7723b883854"
 dependencies = [
  "bstr",
  "thiserror",
@@ -1480,9 +1460,9 @@ dependencies = [
 
 [[package]]
 name = "gix-worktree"
-version = "0.28.0"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f1d0ae01dee14abe8c8117d78d7518f9a507de2dc4522546fbf4c444e9860b4"
+checksum = "53982f8abff0789a9599e644108a1914da61a4d0dede8e45037e744dcb008d52"
 dependencies = [
  "bstr",
  "gix-attributes",
@@ -1498,9 +1478,9 @@ dependencies = [
 
 [[package]]
 name = "gix-worktree-state"
-version = "0.5.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afef3c1cfe610ccfbca391515a1254662a648ce2635c9f60511eb1feb751fa01"
+checksum = "d8c74e732224c051370ce78b84748e36de9ace200dc47983da8629740ece20a1"
 dependencies = [
  "bstr",
  "gix-features",
@@ -1531,9 +1511,9 @@ dependencies = [
 
 [[package]]
 name = "goblin"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134"
+checksum = "bb07a4ffed2093b118a525b1d8f5204ae274faed5604537caf7135d0f18d9887"
 dependencies = [
  "log",
  "plain",
@@ -1542,9 +1522,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.22"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
 dependencies = [
  "bytes",
  "fnv",
@@ -1573,17 +1553,17 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
 
 [[package]]
 name = "home"
-version = "0.5.5"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1622,9 +1602,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "0.14.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1637,7 +1617,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -1725,18 +1705,18 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.66"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "krates"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "574af0483e3c16756f0e5cd82f394be0fb1c898397fd61fdcbd26575457be5d0"
+checksum = "0f230dc2c312031a8b35991334e0937df71a004c71f9b22013806f4147c35c78"
 dependencies = [
  "cargo_metadata",
  "cfg-expr",
@@ -1761,9 +1741,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "linked-hash-map"
@@ -1773,9 +1753,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "lock_api"
@@ -1806,28 +1786,19 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "memmap2"
-version = "0.9.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
+checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92"
 dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -1893,9 +1864,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
@@ -1971,9 +1942,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
 
 [[package]]
 name = "plain"
@@ -1983,9 +1954,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "platforms"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0"
+checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
 dependencies = [
  "serde",
 ]
@@ -1998,24 +1969,24 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "prodash"
-version = "26.2.2"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf"
+checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -2028,9 +1999,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
 dependencies = [
  "either",
  "rayon-core",
@@ -2038,9 +2009,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -2086,9 +2057,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.22"
+version = "0.11.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
 dependencies = [
  "async-compression",
  "base64",
@@ -2171,11 +2142,11 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2265,11 +2236,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2280,22 +2251,22 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scroll"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
+checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6"
 dependencies = [
  "scroll_derive",
 ]
 
 [[package]]
 name = "scroll_derive"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
+checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2333,38 +2304,38 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "itoa",
  "ryu",
@@ -2373,9 +2344,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
  "serde",
 ]
@@ -2436,9 +2407,9 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
+checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"
 
 [[package]]
 name = "slab"
@@ -2451,29 +2422,19 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "smol_str"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
+checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49"
 dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "socket2"
 version = "0.5.5"
@@ -2486,9 +2447,9 @@ dependencies = [
 
 [[package]]
 name = "spdx"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b19b32ed6d899ab23174302ff105c1577e45a06b08d4fe0a9dd13ce804bbbf71"
+checksum = "62bde1398b09b9f93fc2fc9b9da86e362693e999d3a54a8ac47a99a5a73f638b"
 dependencies = [
  "smallvec",
 ]
@@ -2530,7 +2491,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2546,9 +2507,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.40"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2578,9 +2539,9 @@ dependencies = [
 
 [[package]]
 name = "tame-index"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a6758f8c369099cfed0df5a22e7f4d9cde3936c14e560ec4200f1ae3bc5ad1"
+checksum = "6ffb61c3606c3a27fd478e76bd076fb757be29f40140b5a32d30fdaaf75afb92"
 dependencies = [
  "bytes",
  "camino",
@@ -2611,57 +2572,57 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.12"
+version = "0.12.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
+checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae"
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
 dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
 dependencies = [
  "deranged",
  "itoa",
@@ -2681,9 +2642,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
 dependencies = [
  "time-core",
 ]
@@ -2705,9 +2666,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2715,7 +2676,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
- "socket2 0.5.5",
+ "socket2",
  "windows-sys 0.48.0",
 ]
 
@@ -2851,9 +2812,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-bom"
@@ -2939,9 +2900,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -2949,24 +2910,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.39"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2976,9 +2937,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2986,28 +2947,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
 
 [[package]]
 name = "web-sys"
-version = "0.3.66"
+version = "0.3.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3052,20 +3013,21 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.48.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
 dependencies = [
- "windows-targets 0.48.5",
+ "windows-core",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.45.0"
+name = "windows-core"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -3086,21 +3048,6 @@ dependencies = [
  "windows-targets 0.52.0",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -3131,12 +3078,6 @@ dependencies = [
  "windows_x86_64_msvc 0.52.0",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -3149,12 +3090,6 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -3167,12 +3102,6 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -3185,12 +3114,6 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -3203,12 +3126,6 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -3221,12 +3138,6 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -3239,12 +3150,6 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -3259,9 +3164,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
 [[package]]
 name = "winnow"
-version = "0.5.28"
+version = "0.5.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
+checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16"
 dependencies = [
  "memchr",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index a162bbfde..35ee82feb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,7 +64,7 @@ fern = "0.6"
 # Glob matching
 globset = "0.4"
 # Native executable detection
-goblin = { version = "0.7", default-features = false, features = [
+goblin = { version = "0.8", default-features = false, features = [
   "elf32",
   "elf64",
   "mach32",
@@ -75,7 +75,7 @@ goblin = { version = "0.7", default-features = false, features = [
 # We need to figure out HOME/CARGO_HOME in some cases
 home = "0.5"
 # Provides graphs on top of cargo_metadata
-krates = { version = "0.15", features = ["targets"] }
+krates = { version = "0.16", features = ["targets"] }
 # Log macros
 log = "0.4"
 # Nicer sync primitives
@@ -121,7 +121,7 @@ walkdir = "2.3"
 
 # We clone/fetch advisory databases
 [dependencies.gix]
-version = "0.56"
+version = "0.57"
 default-features = false
 features = [
   "blocking-http-transport-reqwest",
diff --git a/deny.toml b/deny.toml
index 57664308d..a00aa5827 100644
--- a/deny.toml
+++ b/deny.toml
@@ -21,6 +21,7 @@ ignore = [
 
 [bans]
 multiple-versions = "deny"
+wildcards = 'deny'
 deny = [
     # We use gix
     { name = "git2" },
@@ -28,17 +29,16 @@ deny = [
     { name = "openssl" },
     { name = "openssl-sys" },
     { name = "libssh2-sys" },
+    # There is literally never a reason to use this
+    { name = "cmake" },
+    # https://github.com/Byron/gitoxide/pull/1245
+    { name = "windows", wrappers = ["gix-sec"] },
 ]
 skip = [
-    # hyper/tokio uses an old version
-    { name = "socket2", version = "=0.4.10" },
     # strum_macros + maybe-async
     { name = "syn", version = "=1.0.109" },
     # security-framework uses an ooooold version
     { name = "bitflags", version = "=1.3.2" },
-    # gix via gix-packetline depends on 2 versions, but will be fixed in the next
-    # release
-    { name = "faster-hex", version = "=0.8.1" },
 ]
 skip-tree = [
     # Sigh
diff --git a/docs/src/checks/bans/README.md b/docs/src/checks/bans/README.md
index f70befec9..212549b7a 100644
--- a/docs/src/checks/bans/README.md
+++ b/docs/src/checks/bans/README.md
@@ -32,7 +32,7 @@ The intention of duplicate detection in cargo-deny is not to "correct" cargo's b
 
 * Maybe you want to open up a PR on a crate to use a version of the duplicate that is aligned with the rest of the ecosystem.
 * Maybe the crate has actually already been updated, but the maintainer hasn't published a new version yet, and you can ask if they can publish a new one.
-* Maybe, even though the versions are supposedly incompatible according to semver, they actually aren't, and you can temporarily introduce a `[patch]` to force the crate to use a particular version for your entire workspace.
+* Maybe, even though the versions are supposedly incompatible according to semver, they actually aren't, and you can temporarily patch 1 or more crates to use a different version requirement without actually change the crates' code itself.
 * Sometimes having the "latest and greatest" is not really that important for every version, and you can just specify a lower version in your own project that matches the transitive constraint(s).
 * And finally, you don't care about a particular case of multiple versions, so you just tell cargo-deny to ignore one or more of the specific versions, and the situation will eventually resolve itself.
 
diff --git a/src/advisories/helpers/db.rs b/src/advisories/helpers/db.rs
index a4d308b61..08980cfbb 100644
--- a/src/advisories/helpers/db.rs
+++ b/src/advisories/helpers/db.rs
@@ -1,7 +1,7 @@
 use crate::{utf8path, Krate, Krates, Path, PathBuf};
 use anyhow::Context as _;
 use log::{debug, info};
-pub use rustsec::{advisory::Id, Database, Lockfile, Vulnerability};
+pub use rustsec::{advisory::Id, Database};
 use std::fmt;
 use url::Url;
 
@@ -556,8 +556,6 @@ fn fetch_via_cli(url: &str, db_path: &Path) -> anyhow::Result<()> {
     Ok(())
 }
 
-pub use rustsec::{Warning, WarningKind};
-
 pub struct Report<'db, 'k> {
     pub advisories: Vec<(&'k Krate, krates::NodeId, &'db rustsec::Advisory)>,
     /// For backwards compatiblity with cargo-audit, we optionally serialize the
@@ -615,8 +613,8 @@ impl<'db, 'k> Report<'db, 'k> {
                     krates
                         .krates_by_name(advisory.metadata.package.as_str())
                         .par_bridge()
-                        .filter_map(move |(nid, krate)| {
-                            let ksrc = krate.source.as_ref()?;
+                        .filter_map(move |km| {
+                            let ksrc = km.krate.source.as_ref()?;
 
                             // Validate the crate's source is the same as the advisory
                             if !ksrc.matches_rustsec(advisory.metadata.source.as_ref()) {
@@ -624,11 +622,11 @@ impl<'db, 'k> Report<'db, 'k> {
                             }
 
                             // Ensure the crate's version is actually affected
-                            if !advisory.versions.is_vulnerable(&krate.version) {
+                            if !advisory.versions.is_vulnerable(&km.krate.version) {
                                 return None;
                             }
 
-                            Some((krate, nid, advisory))
+                            Some((km.krate, km.node_id, advisory))
                         })
                 })
                 .collect();
diff --git a/src/bans.rs b/src/bans.rs
index 66b7b0bba..eeb95253c 100644
--- a/src/bans.rs
+++ b/src/bans.rs
@@ -83,13 +83,11 @@ impl TreeSkipper {
         for ts in skip_roots {
             let num_roots = roots.len();
 
-            for krate in krates
-                .krates_by_name(&ts.value.id.name)
-                .filter(|(_index, krate)| {
-                    crate::match_req(&krate.version, ts.value.id.version.as_ref())
-                })
-            {
-                roots.push(Self::build_skip_root(ts.clone(), krate.0, krates));
+            for nid in krates.krates_by_name(&ts.value.id.name).filter_map(|km| {
+                crate::match_req(&km.krate.version, ts.value.id.version.as_ref())
+                    .then_some(km.node_id)
+            }) {
+                roots.push(Self::build_skip_root(ts.clone(), nid, krates));
             }
 
             // If no roots were added, add a diagnostic that the user's configuration
@@ -288,7 +286,7 @@ pub fn check(
         let mut kids = smallvec::SmallVec::<[Dupe; 2]>::new();
 
         for dup in multi_detector.dupes.iter().cloned() {
-            let span = &ctx.krate_spans[dup];
+            let span = &ctx.krate_spans[dup].total;
 
             if span.start < all_start {
                 all_start = span.start;
@@ -1242,13 +1240,15 @@ fn check_is_executable(
         return Ok(None);
     }
 
+    use goblin::Hint;
+
     match goblin::peek_bytes(&header)
         .map_err(|err| anyhow::format_err!("failed to peek bytes: {err}"))?
     {
         // Archive objects/libraries are not great (generally) to have in
         // crate packages, but they are not as easily
-        goblin::Hint::Archive if exclude_archives => Ok(None),
-        goblin::Hint::Unknown(_) => {
+        Hint::Archive if exclude_archives => Ok(None),
+        Hint::Unknown(_) => {
             // Check for shebang scripts
             if header[..2] != [0x23, 0x21] {
                 return Ok(None);
@@ -1298,6 +1298,7 @@ fn check_is_executable(
 
             Ok(parse().map(|s| ExecutableKind::Interpreted(s.to_owned())))
         }
+        Hint::COFF => Ok(None),
         hint => Ok(Some(ExecutableKind::Native(hint))),
     }
 }
diff --git a/src/bans/diags.rs b/src/bans/diags.rs
index 7395344ff..64ace0052 100644
--- a/src/bans/diags.rs
+++ b/src/bans/diags.rs
@@ -681,7 +681,7 @@ impl From<DetectedExecutable<'_>> for Diag {
                     goblin::Hint::PE => "pe",
                     goblin::Hint::Mach(_) | goblin::Hint::MachFat(_) => "mach",
                     goblin::Hint::Archive => "archive",
-                    goblin::Hint::Unknown(_) => unreachable!(),
+                    _ => unreachable!("unhandled format {hint:#?} for {}", de.path),
                 };
 
                 (
diff --git a/src/cargo-deny/list.rs b/src/cargo-deny/list.rs
index b116be019..d14bcba9e 100644
--- a/src/cargo-deny/list.rs
+++ b/src/cargo-deny/list.rs
@@ -155,27 +155,56 @@ pub fn cmd(
 
     let summary = gatherer.gather(&krates, &mut files, None);
 
+    use std::borrow::Cow;
+
+    #[derive(Ord, PartialOrd, PartialEq, Eq)]
+    struct SerKid<'k>(Cow<'k, Kid>);
+
+    impl<'k> serde::Serialize for SerKid<'k> {
+        fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: serde::Serializer,
+        {
+            serializer.serialize_str(&format!(
+                "{} {} {}",
+                self.0.name(),
+                self.0.version(),
+                self.0.source()
+            ))
+        }
+    }
+
+    impl<'k> SerKid<'k> {
+        fn parts(&self) -> (&str, &str) {
+            (self.0.name(), self.0.version())
+        }
+    }
+
     #[derive(Serialize)]
     struct Crate {
         licenses: Vec<String>,
     }
 
     #[derive(Serialize)]
-    struct LicenseLayout<'a> {
-        licenses: Vec<(String, Vec<&'a Kid>)>,
-        unlicensed: Vec<&'a Kid>,
+    struct LicenseLayout<'k> {
+        licenses: Vec<(String, Vec<SerKid<'k>>)>,
+        unlicensed: Vec<SerKid<'k>>,
     }
 
-    struct CrateLayout {
-        crates: BTreeMap<Kid, Crate>,
+    struct CrateLayout<'k> {
+        crates: BTreeMap<SerKid<'k>, Crate>,
     }
 
-    impl CrateLayout {
-        fn search(&self, id: &Kid) -> &Crate {
+    impl<'k> CrateLayout<'k> {
+        fn search(&self, id: &SerKid<'k>) -> &Crate {
             self.crates.get(id).expect("unable to find crate")
         }
     }
 
+    fn borrow(kid: &Kid) -> SerKid<'_> {
+        SerKid(Cow::Borrowed(kid))
+    }
+
     let mut crate_layout = CrateLayout {
         crates: BTreeMap::new(),
     };
@@ -204,10 +233,10 @@ pub fn cmd(
                         }
 
                         match licenses.binary_search_by(|(r, _)| r.cmp(&s)) {
-                            Ok(i) => licenses[i].1.push(&krate_lic_nfo.krate.id),
+                            Ok(i) => licenses[i].1.push(borrow(&krate_lic_nfo.krate.id)),
                             Err(i) => {
                                 let mut v = Vec::with_capacity(20);
-                                v.push(&krate_lic_nfo.krate.id);
+                                v.push(borrow(&krate_lic_nfo.krate.id));
                                 licenses.insert(i, (s.clone(), v));
                             }
                         }
@@ -215,26 +244,19 @@ pub fn cmd(
                     }
                 }
                 LicenseInfo::Unlicensed => {
-                    unlicensed.push(&krate_lic_nfo.krate.id);
+                    unlicensed.push(borrow(&krate_lic_nfo.krate.id));
                 }
             }
 
             crate_layout
                 .crates
-                .insert(krate_lic_nfo.krate.id.clone(), cur);
+                .insert(SerKid(Cow::Owned(krate_lic_nfo.krate.id.clone())), cur);
         }
     }
 
-    fn get_parts(pid: &Kid) -> (&str, &str) {
-        let mut it = pid.repr.split(' ');
-
-        (it.next().unwrap(), it.next().unwrap())
-    }
-
-    fn write_pid(out: &mut String, pid: &Kid) -> Result<(), Error> {
-        let parts = get_parts(pid);
-
-        Ok(write!(out, "{}@{}", parts.0, parts.1)?)
+    fn write_pid(out: &mut String, pid: &SerKid<'_>) -> Result<(), Error> {
+        let (name, version) = pid.parts();
+        Ok(write!(out, "{name}@{version}")?)
     }
 
     match args.format {
@@ -244,19 +266,19 @@ pub fn cmd(
 
             match args.layout {
                 Layout::License => {
-                    for license in license_layout.licenses {
+                    for (license, krates) in license_layout.licenses {
                         if color {
                             write!(
                                 output,
                                 "{} ({}): ",
-                                Color::Cyan.paint(&license.0),
-                                Color::White.bold().paint(license.1.len().to_string())
+                                Color::Cyan.paint(&license),
+                                Color::White.bold().paint(krates.len().to_string())
                             )?;
                         } else {
-                            write!(output, "{} ({}): ", license.0, license.1.len())?;
+                            write!(output, "{license} ({}): ", krates.len())?;
                         }
 
-                        for (i, krate_id) in license.1.iter().enumerate() {
+                        for (i, krate_id) in krates.iter().enumerate() {
                             if i != 0 {
                                 write!(output, ", ")?;
                             }
@@ -269,8 +291,8 @@ pub fn cmd(
                                     Color::White
                                 };
 
-                                let parts = get_parts(krate_id);
-                                write!(output, "{}@{}", color.paint(parts.0), parts.1,)?;
+                                let (name, version) = krate_id.parts();
+                                write!(output, "{}@{version}", color.paint(name))?;
                             } else {
                                 write_pid(&mut output, krate_id)?;
                             }
@@ -306,6 +328,8 @@ pub fn cmd(
                 }
                 Layout::Crate => {
                     for (id, krate) in crate_layout.crates {
+                        let (name, version) = id.parts();
+
                         if color {
                             let color = match krate.licenses.len() {
                                 1 => Color::White,
@@ -313,23 +337,14 @@ pub fn cmd(
                                 _ => Color::Yellow,
                             };
 
-                            let parts = get_parts(&id);
                             write!(
                                 output,
-                                "{}@{} ({}): ",
-                                color.paint(parts.0),
-                                parts.1,
+                                "{}@{version} ({}): ",
+                                color.paint(name),
                                 Color::White.bold().paint(krate.licenses.len().to_string()),
                             )?;
                         } else {
-                            let parts = get_parts(&id);
-                            write!(
-                                output,
-                                "{}@{} ({}): ",
-                                parts.0,
-                                parts.1,
-                                krate.licenses.len(),
-                            )?;
+                            write!(output, "{name}@{version} ({}): ", krate.licenses.len(),)?;
                         }
 
                         for (i, license) in krate.licenses.iter().enumerate() {
@@ -340,7 +355,7 @@ pub fn cmd(
                             if color {
                                 write!(output, "{}", Color::Cyan.paint(license))?;
                             } else {
-                                write!(output, "{}", license)?;
+                                write!(output, "{license}")?;
                             }
                         }
 
@@ -365,8 +380,8 @@ pub fn cmd(
             {
                 write!(output, "crate")?;
 
-                for license in &license_layout.licenses {
-                    write!(output, "\t{}", license.0)?;
+                for (license, _) in &license_layout.licenses {
+                    write!(output, "\t{license}")?;
                 }
 
                 if !license_layout.unlicensed.is_empty() {
@@ -380,7 +395,7 @@ pub fn cmd(
                 write_pid(&mut output, &id)?;
 
                 for lic in &license_layout.licenses {
-                    if lic.1.binary_search(&&id).is_ok() {
+                    if lic.1.binary_search(&id).is_ok() {
                         write!(output, "\tX")?;
                     } else {
                         write!(output, "\t")?;
diff --git a/src/cargo-deny/main.rs b/src/cargo-deny/main.rs
index 740dd74f5..1a8f683dc 100644
--- a/src/cargo-deny/main.rs
+++ b/src/cargo-deny/main.rs
@@ -307,10 +307,17 @@ fn real_main() -> Result<(), Error> {
 
     // Allow gix to hook the signal handler so that it can properly release lockfiles
     // if the user aborts or we crash
-    let _dereg = gix::interrupt::init_handler(0, || {
-        log::info!("gix interrupt handler triggered, terminating process...");
-    })
-    .context("failed to initialize gix's interrupt handler")?;
+    #[allow(unsafe_code)]
+    // SAFETY: The code in the callback must be async signal safe, but we don't
+    // have any code in there because the callback is not actually invoked since
+    // we send a grace_count of 0, the callback is only invoked if grace_count > 0
+    let _dereg = unsafe {
+        gix::interrupt::init_handler(0, || {
+            //const BUF: &[u8] = b"gix interrupt handler triggered, terminating process...\n";
+            //libc::write(libc::STDERR_FILENO, BUF.as_ptr().cast(), BUF.len());
+        })
+        .context("failed to initialize gix's interrupt handler")?
+    };
 
     match args.cmd {
         Command::Check(mut cargs) => {
diff --git a/src/diag.rs b/src/diag.rs
index 65f65f678..c2d082a12 100644
--- a/src/diag.rs
+++ b/src/diag.rs
@@ -146,7 +146,8 @@ where
 pub type Span = std::ops::Range<usize>;
 
 pub struct KrateSpan {
-    span: Span,
+    pub total: Span,
+    pub source: usize,
 }
 
 pub struct KrateSpans {
@@ -155,11 +156,11 @@ pub struct KrateSpans {
 }
 
 impl std::ops::Index<usize> for KrateSpans {
-    type Output = Span;
+    type Output = KrateSpan;
 
     #[inline]
     fn index(&self, i: usize) -> &Self::Output {
-        &self.spans[i].span
+        &self.spans[i]
     }
 }
 
@@ -182,24 +183,18 @@ impl KrateSpans {
         krates.sort_unstable_by_key(|a| (&a.name, &a.version));
         for krate in krates {
             let span_start = sl.len();
-            match &krate.source {
-                Some(src) => writeln!(sl, "{} {} {}", krate.name, krate.version, src)
-                    .expect("unable to synthesize lockfile"),
-                None => writeln!(
-                    sl,
-                    "{} {} {}",
-                    krate.name,
-                    krate.version,
-                    krate.manifest_path.parent().unwrap()
-                )
-                .expect("unable to synthesize lockfile"),
+            let source = if krate.source.is_some() {
+                krate.id.source()
+            } else {
+                krate.manifest_path.parent().unwrap().as_str()
             };
 
-            let span_end = sl.len() - 1;
+            writeln!(sl, "{} {} {source}", krate.name, krate.version)
+                .expect("unable to synthesize lockfile");
 
-            spans.push(KrateSpan {
-                span: span_start..span_end,
-            });
+            let total = span_start..sl.len() - 1;
+            let source = total.end - source.len();
+            spans.push(KrateSpan { total, source });
 
             let mut sl2 = String::with_capacity(4 * 1024);
             let mut deps_map = HashMap::new();
@@ -223,14 +218,14 @@ impl KrateSpans {
 
     #[inline]
     pub fn label_for_index(&self, krate_index: usize, msg: impl Into<String>) -> Label {
-        Label::secondary(self.file_id, self.spans[krate_index].span.clone()).with_message(msg)
+        Label::secondary(self.file_id, self.spans[krate_index].total.clone()).with_message(msg)
     }
 
     #[inline]
     pub fn get_coord(&self, krate_index: usize) -> KrateCoord {
         KrateCoord {
             file: self.file_id,
-            span: self.spans[krate_index].span.clone(),
+            span: self.spans[krate_index].total.clone(),
         }
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index fde1b7601..3b26c41cf 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -224,9 +224,7 @@ impl Default for Krate {
             name: "".to_owned(),
             version: Version::new(0, 1, 0),
             authors: Vec::new(),
-            id: Kid {
-                repr: "".to_owned(),
-            },
+            id: Kid::default(),
             source: None,
             description: None,
             deps: Vec::new(),
@@ -292,7 +290,7 @@ impl From<cm::Package> for Krate {
 
         Self {
             name: pkg.name,
-            id: pkg.id,
+            id: pkg.id.into(),
             version: pkg.version,
             authors: pkg.authors,
             repository: pkg.repository,
diff --git a/src/sources.rs b/src/sources.rs
index fc54444b1..c57219ca4 100644
--- a/src/sources.rs
+++ b/src/sources.rs
@@ -45,15 +45,11 @@ pub fn check(ctx: crate::CheckCtx<'_, ValidConfig>, sink: impl Into<ErrorSink>)
 
         let mut pack = Pack::with_kid(Check::Sources, krate.id.clone());
 
-        let source_label = {
-            let mut span = ctx.krate_spans[i].clone();
-
-            // The krate span is the complete id, but we only want
-            // to highlight the source component
-            let last_space = krate.id.repr.rfind(' ').unwrap();
-
-            span.start = span.start + last_space + 1;
-            Label::primary(ctx.krate_spans.file_id, span).with_message("source")
+        let mut sl = None;
+        let label = || {
+            let span = &ctx.krate_spans[i];
+            Label::primary(ctx.krate_spans.file_id, span.source..span.total.end)
+                .with_message("source")
         };
 
         // get allowed list of sources to check
@@ -64,7 +60,7 @@ pub fn check(ctx: crate::CheckCtx<'_, ValidConfig>, sink: impl Into<ErrorSink>)
             if let Some((min, cfg_coord)) = &min_git_spec {
                 if spec < *min {
                     pack.push(diags::BelowMinimumRequiredSpec {
-                        src_label: &source_label,
+                        src_label: sl.get_or_insert_with(label),
                         min_spec: *min,
                         actual_spec: spec,
                         min_spec_cfg: cfg_coord.clone(),
@@ -94,7 +90,7 @@ pub fn check(ctx: crate::CheckCtx<'_, ValidConfig>, sink: impl Into<ErrorSink>)
             }
 
             diags::ExplicitlyAllowedSource {
-                src_label: &source_label,
+                src_label: sl.get_or_insert_with(label),
                 type_name,
                 allow_cfg: CfgCoord {
                     file: ctx.cfg.file_id,
@@ -116,7 +112,7 @@ pub fn check(ctx: crate::CheckCtx<'_, ValidConfig>, sink: impl Into<ErrorSink>)
             {
                 org_hits.as_mut_bitslice().set(ind, true);
                 diags::SourceAllowedByOrg {
-                    src_label: &source_label,
+                    src_label: sl.get_or_insert_with(label),
                     org_cfg: CfgCoord {
                         file: ctx.cfg.file_id,
                         span: ctx.cfg.allowed_orgs[ind].1.span.clone(),
@@ -125,7 +121,7 @@ pub fn check(ctx: crate::CheckCtx<'_, ValidConfig>, sink: impl Into<ErrorSink>)
                 .into()
             } else {
                 diags::SourceNotExplicitlyAllowed {
-                    src_label: &source_label,
+                    src_label: sl.get_or_insert_with(label),
                     lint_level,
                     type_name,
                 }
@@ -133,7 +129,7 @@ pub fn check(ctx: crate::CheckCtx<'_, ValidConfig>, sink: impl Into<ErrorSink>)
             }
         } else {
             diags::SourceNotExplicitlyAllowed {
-                src_label: &source_label,
+                src_label: sl.get_or_insert_with(label),
                 lint_level,
                 type_name,
             }
diff --git a/tests/snapshots/sources__allows_bitbucket_org.snap b/tests/snapshots/sources__allows_bitbucket_org.snap
index da6564685..c62aebd66 100644
--- a/tests/snapshots/sources__allows_bitbucket_org.snap
+++ b/tests/snapshots/sources__allows_bitbucket_org.snap
@@ -28,7 +28,7 @@ expression: diags
           "column": 22,
           "line": 7,
           "message": "source",
-          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617#0c2da61772b89323af9dcfed0ed00b2a698d95b5"
+          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -69,7 +69,7 @@ expression: diags
           "column": 22,
           "line": 8,
           "message": "source",
-          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617#0c2da61772b89323af9dcfed0ed00b2a698d95b5"
+          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -101,7 +101,7 @@ expression: diags
           "column": 15,
           "line": 9,
           "message": "source",
-          "span": "git+https://github.com/dtolnay/anyhow#0a45d7665c32ba61788e09273bb17912ed402332"
+          "span": "git+https://github.com/dtolnay/anyhow?branch=master"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -133,7 +133,7 @@ expression: diags
           "column": 15,
           "line": 45,
           "message": "source",
-          "span": "git+https://github.com/EmbarkStudios/krates?branch=main#6aa02ee69d69444c910f0ca04ccebb949d76e738"
+          "span": "git+https://github.com/EmbarkStudios/krates?branch=main"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -166,7 +166,7 @@ expression: diags
           "column": 17,
           "line": 49,
           "message": "source",
-          "span": "git+https://bitbucket.org/marshallpierce/line-wrap-rs#41e42b9d95684d41615dd3d0aeeb1cfc4cc47225"
+          "span": "git+https://bitbucket.org/marshallpierce/line-wrap-rs"
         },
         {
           "column": 18,
@@ -205,7 +205,7 @@ expression: diags
           "column": 12,
           "line": 94,
           "message": "source",
-          "span": "git+https://github.com/EmbarkStudios/spdx?tag=0.3.4#ba8dc9f0b164619771892b865f00236ebbd4cd39"
+          "span": "git+https://github.com/EmbarkStudios/spdx?tag=0.3.4"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
diff --git a/tests/snapshots/sources__allows_git.snap b/tests/snapshots/sources__allows_git.snap
index acd37b8e5..2dbf64c5b 100644
--- a/tests/snapshots/sources__allows_git.snap
+++ b/tests/snapshots/sources__allows_git.snap
@@ -28,7 +28,7 @@ expression: diags
           "column": 22,
           "line": 7,
           "message": "source",
-          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617#0c2da61772b89323af9dcfed0ed00b2a698d95b5"
+          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617"
         },
         {
           "column": 9,
@@ -75,7 +75,7 @@ expression: diags
           "column": 22,
           "line": 8,
           "message": "source",
-          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617#0c2da61772b89323af9dcfed0ed00b2a698d95b5"
+          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617"
         },
         {
           "column": 9,
@@ -113,7 +113,7 @@ expression: diags
           "column": 15,
           "line": 9,
           "message": "source",
-          "span": "git+https://github.com/dtolnay/anyhow#0a45d7665c32ba61788e09273bb17912ed402332"
+          "span": "git+https://github.com/dtolnay/anyhow?branch=master"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -145,7 +145,7 @@ expression: diags
           "column": 15,
           "line": 45,
           "message": "source",
-          "span": "git+https://github.com/EmbarkStudios/krates?branch=main#6aa02ee69d69444c910f0ca04ccebb949d76e738"
+          "span": "git+https://github.com/EmbarkStudios/krates?branch=main"
         },
         {
           "column": 9,
@@ -184,7 +184,7 @@ expression: diags
           "column": 17,
           "line": 49,
           "message": "source",
-          "span": "git+https://bitbucket.org/marshallpierce/line-wrap-rs#41e42b9d95684d41615dd3d0aeeb1cfc4cc47225"
+          "span": "git+https://bitbucket.org/marshallpierce/line-wrap-rs"
         },
         {
           "column": 9,
@@ -223,7 +223,7 @@ expression: diags
           "column": 12,
           "line": 94,
           "message": "source",
-          "span": "git+https://github.com/EmbarkStudios/spdx?tag=0.3.4#ba8dc9f0b164619771892b865f00236ebbd4cd39"
+          "span": "git+https://github.com/EmbarkStudios/spdx?tag=0.3.4"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
diff --git a/tests/snapshots/sources__allows_github_org.snap b/tests/snapshots/sources__allows_github_org.snap
index d349e955f..cfdbe2b8d 100644
--- a/tests/snapshots/sources__allows_github_org.snap
+++ b/tests/snapshots/sources__allows_github_org.snap
@@ -28,7 +28,7 @@ expression: diags
           "column": 22,
           "line": 7,
           "message": "source",
-          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617#0c2da61772b89323af9dcfed0ed00b2a698d95b5"
+          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -69,7 +69,7 @@ expression: diags
           "column": 22,
           "line": 8,
           "message": "source",
-          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617#0c2da61772b89323af9dcfed0ed00b2a698d95b5"
+          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -101,7 +101,7 @@ expression: diags
           "column": 15,
           "line": 9,
           "message": "source",
-          "span": "git+https://github.com/dtolnay/anyhow#0a45d7665c32ba61788e09273bb17912ed402332"
+          "span": "git+https://github.com/dtolnay/anyhow?branch=master"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -133,7 +133,7 @@ expression: diags
           "column": 15,
           "line": 45,
           "message": "source",
-          "span": "git+https://github.com/EmbarkStudios/krates?branch=main#6aa02ee69d69444c910f0ca04ccebb949d76e738"
+          "span": "git+https://github.com/EmbarkStudios/krates?branch=main"
         },
         {
           "column": 15,
@@ -172,7 +172,7 @@ expression: diags
           "column": 17,
           "line": 49,
           "message": "source",
-          "span": "git+https://bitbucket.org/marshallpierce/line-wrap-rs#41e42b9d95684d41615dd3d0aeeb1cfc4cc47225"
+          "span": "git+https://bitbucket.org/marshallpierce/line-wrap-rs"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -205,7 +205,7 @@ expression: diags
           "column": 12,
           "line": 94,
           "message": "source",
-          "span": "git+https://github.com/EmbarkStudios/spdx?tag=0.3.4#ba8dc9f0b164619771892b865f00236ebbd4cd39"
+          "span": "git+https://github.com/EmbarkStudios/spdx?tag=0.3.4"
         },
         {
           "column": 15,
diff --git a/tests/snapshots/sources__allows_gitlab_org.snap b/tests/snapshots/sources__allows_gitlab_org.snap
index 5250dfc4e..033526d5e 100644
--- a/tests/snapshots/sources__allows_gitlab_org.snap
+++ b/tests/snapshots/sources__allows_gitlab_org.snap
@@ -28,7 +28,7 @@ expression: diags
           "column": 22,
           "line": 7,
           "message": "source",
-          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617#0c2da61772b89323af9dcfed0ed00b2a698d95b5"
+          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617"
         },
         {
           "column": 15,
@@ -75,7 +75,7 @@ expression: diags
           "column": 22,
           "line": 8,
           "message": "source",
-          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617#0c2da61772b89323af9dcfed0ed00b2a698d95b5"
+          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617"
         },
         {
           "column": 15,
@@ -113,7 +113,7 @@ expression: diags
           "column": 15,
           "line": 9,
           "message": "source",
-          "span": "git+https://github.com/dtolnay/anyhow#0a45d7665c32ba61788e09273bb17912ed402332"
+          "span": "git+https://github.com/dtolnay/anyhow?branch=master"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -145,7 +145,7 @@ expression: diags
           "column": 15,
           "line": 45,
           "message": "source",
-          "span": "git+https://github.com/EmbarkStudios/krates?branch=main#6aa02ee69d69444c910f0ca04ccebb949d76e738"
+          "span": "git+https://github.com/EmbarkStudios/krates?branch=main"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -178,7 +178,7 @@ expression: diags
           "column": 17,
           "line": 49,
           "message": "source",
-          "span": "git+https://bitbucket.org/marshallpierce/line-wrap-rs#41e42b9d95684d41615dd3d0aeeb1cfc4cc47225"
+          "span": "git+https://bitbucket.org/marshallpierce/line-wrap-rs"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -211,7 +211,7 @@ expression: diags
           "column": 12,
           "line": 94,
           "message": "source",
-          "span": "git+https://github.com/EmbarkStudios/spdx?tag=0.3.4#ba8dc9f0b164619771892b865f00236ebbd4cd39"
+          "span": "git+https://github.com/EmbarkStudios/spdx?tag=0.3.4"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
diff --git a/tests/snapshots/sources__fails_unknown_git.snap b/tests/snapshots/sources__fails_unknown_git.snap
index 04e1688d3..fdd3b0307 100644
--- a/tests/snapshots/sources__fails_unknown_git.snap
+++ b/tests/snapshots/sources__fails_unknown_git.snap
@@ -28,7 +28,7 @@ expression: diags
           "column": 22,
           "line": 7,
           "message": "source",
-          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617#0c2da61772b89323af9dcfed0ed00b2a698d95b5"
+          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -69,7 +69,7 @@ expression: diags
           "column": 22,
           "line": 8,
           "message": "source",
-          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617#0c2da61772b89323af9dcfed0ed00b2a698d95b5"
+          "span": "git+https://gitlab.com/amethyst-engine/amethyst?rev=0c2da617"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -101,7 +101,7 @@ expression: diags
           "column": 15,
           "line": 9,
           "message": "source",
-          "span": "git+https://github.com/dtolnay/anyhow#0a45d7665c32ba61788e09273bb17912ed402332"
+          "span": "git+https://github.com/dtolnay/anyhow?branch=master"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -133,7 +133,7 @@ expression: diags
           "column": 15,
           "line": 45,
           "message": "source",
-          "span": "git+https://github.com/EmbarkStudios/krates?branch=main#6aa02ee69d69444c910f0ca04ccebb949d76e738"
+          "span": "git+https://github.com/EmbarkStudios/krates?branch=main"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -166,7 +166,7 @@ expression: diags
           "column": 17,
           "line": 49,
           "message": "source",
-          "span": "git+https://bitbucket.org/marshallpierce/line-wrap-rs#41e42b9d95684d41615dd3d0aeeb1cfc4cc47225"
+          "span": "git+https://bitbucket.org/marshallpierce/line-wrap-rs"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",
@@ -199,7 +199,7 @@ expression: diags
           "column": 12,
           "line": 94,
           "message": "source",
-          "span": "git+https://github.com/EmbarkStudios/spdx?tag=0.3.4#ba8dc9f0b164619771892b865f00236ebbd4cd39"
+          "span": "git+https://github.com/EmbarkStudios/spdx?tag=0.3.4"
         }
       ],
       "message": "detected 'git' source not explicitly allowed",