From 5c8034bd76447a8e32069a04ee9a54f78685338c Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 9 Feb 2024 14:36:21 -0800
Subject: [PATCH] Update a few crates on their major version tracks

Found via `cargo outdated` and the vets here were easy enough.
---
 Cargo.lock                                | 55 +++++++++++++--
 Cargo.toml                                |  2 +-
 crates/cache/Cargo.toml                   |  2 +-
 crates/cache/src/config.rs                |  4 +-
 crates/cache/src/config/tests.rs          | 84 +++++++++++------------
 crates/cache/src/tests.rs                 |  6 +-
 crates/cache/src/worker.rs                |  6 +-
 crates/cache/src/worker/tests.rs          | 20 +++---
 crates/environ/Cargo.toml                 |  2 +-
 crates/test-programs/artifacts/Cargo.toml |  2 +-
 crates/wasi/src/preview2/preview1.rs      |  3 +-
 supply-chain/audits.toml                  | 48 +++++++++++++
 supply-chain/imports.lock                 | 50 ++++++++++++--
 13 files changed, 204 insertions(+), 80 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f85932189cc9..b347a8b9fddd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -374,9 +374,9 @@ dependencies = [
 
 [[package]]
 name = "cargo_metadata"
-version = "0.15.3"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
 dependencies = [
  "camino",
  "cargo-platform",
@@ -553,9 +553,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpp_demangle"
-version = "0.3.5"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
+checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119"
 dependencies = [
  "cfg-if",
 ]
@@ -2364,6 +2364,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "sha2"
 version = "0.10.2"
@@ -2736,11 +2745,36 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
 dependencies = [
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951"
+dependencies = [
+ "indexmap 2.0.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
 ]
 
 [[package]]
@@ -4158,6 +4192,15 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
+[[package]]
+name = "winnow"
+version = "0.5.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winx"
 version = "0.36.3"
diff --git a/Cargo.toml b/Cargo.toml
index 59245a5a2656..18b6c0c17548 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -262,7 +262,7 @@ thiserror = "1.0.43"
 async-trait = "0.1.71"
 heck = "0.4"
 similar = "2.1.0"
-toml = "0.5.9"
+toml = "0.8.10"
 # serde and serde_derive must have the same version
 serde = "1.0.188"
 serde_derive = "1.0.188"
diff --git a/crates/cache/Cargo.toml b/crates/cache/Cargo.toml
index 4e4b71e0e66a..5156afc3588d 100644
--- a/crates/cache/Cargo.toml
+++ b/crates/cache/Cargo.toml
@@ -20,7 +20,7 @@ log = { workspace = true }
 serde = "1.0.188"
 serde_derive = "1.0.188"
 sha2 = "0.10.2"
-toml = "0.5.5"
+toml = { workspace = true }
 zstd = { version = "0.13.0", default-features = false }
 
 [target.'cfg(target_os = "windows")'.dependencies.windows-sys]
diff --git a/crates/cache/src/config.rs b/crates/cache/src/config.rs
index d7b8f3d4f019..e0bdc6d45d5e 100644
--- a/crates/cache/src/config.rs
+++ b/crates/cache/src/config.rs
@@ -407,11 +407,11 @@ impl CacheConfig {
         match (entity_exists, user_custom_file) {
             (false, false) => Ok(Self::new_cache_enabled_template()),
             _ => {
-                let bytes = fs::read(&config_file).context(format!(
+                let contents = fs::read_to_string(&config_file).context(format!(
                     "failed to read config file: {}",
                     config_file.display()
                 ))?;
-                let config = toml::from_slice::<Config>(&bytes[..]).context(format!(
+                let config = toml::from_str::<Config>(&contents).context(format!(
                     "failed to parse config file: {}",
                     config_file.display()
                 ))?;
diff --git a/crates/cache/src/config/tests.rs b/crates/cache/src/config/tests.rs
index 0c1dc873fb69..a845bec682ec 100644
--- a/crates/cache/src/config/tests.rs
+++ b/crates/cache/src/config/tests.rs
@@ -19,10 +19,7 @@ pub fn test_prolog() -> (TempDir, PathBuf, PathBuf) {
 macro_rules! load_config {
     ($config_path:ident, $content_fmt:expr, $cache_dir:ident) => {{
         let config_path = &$config_path;
-        let content = format!(
-            $content_fmt,
-            cache_dir = toml::to_string_pretty(&format!("{}", $cache_dir.display())).unwrap()
-        );
+        let content = format!($content_fmt, cache_dir = $cache_dir.display());
         fs::write(config_path, content).expect("Failed to write test config file");
         CacheConfig::from_file(Some(config_path)).unwrap()
     }};
@@ -31,10 +28,7 @@ macro_rules! load_config {
 macro_rules! bad_config {
     ($config_path:ident, $content_fmt:expr, $cache_dir:ident) => {{
         let config_path = &$config_path;
-        let content = format!(
-            $content_fmt,
-            cache_dir = toml::to_string_pretty(&format!("{}", $cache_dir.display())).unwrap()
-        );
+        let content = format!($content_fmt, cache_dir = $cache_dir.display());
         fs::write(config_path, content).expect("Failed to write test config file");
         assert!(CacheConfig::from_file(Some(config_path)).is_err());
     }};
@@ -60,7 +54,7 @@ fn test_unrecognized_settings() {
         "unrecognized-setting = 42\n\
          [cache]\n\
          enabled = true\n\
-         directory = {cache_dir}",
+         directory = '{cache_dir}'",
         cd
     );
 
@@ -68,7 +62,7 @@ fn test_unrecognized_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          unrecognized-setting = 42",
         cd
     );
@@ -81,7 +75,7 @@ fn test_all_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '16'\n\
          baseline-compression-level = 3\n\
          optimized-compression-level = 20\n\
@@ -102,7 +96,7 @@ fn test_all_settings() {
         // added some white spaces
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size  = ' 16\t'\n\
          baseline-compression-level = 3\n\
          optimized-compression-level =\t 20\n\
@@ -151,7 +145,7 @@ fn test_compression_level_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          baseline-compression-level = 1\n\
          optimized-compression-level = 21",
         cd
@@ -164,7 +158,7 @@ fn test_compression_level_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          baseline-compression-level = -1\n\
          optimized-compression-level = 21",
         cd
@@ -174,7 +168,7 @@ fn test_compression_level_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          baseline-compression-level = 15\n\
          optimized-compression-level = 10",
         cd
@@ -188,7 +182,7 @@ fn test_si_prefix_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '42'\n\
          optimized-compression-usage-counter-threshold = '4K'\n\
          file-count-soft-limit = '3M'",
@@ -203,7 +197,7 @@ fn test_si_prefix_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '2K'\n\
          optimized-compression-usage-counter-threshold = '4444T'\n\
          file-count-soft-limit = '1P'",
@@ -222,7 +216,7 @@ fn test_si_prefix_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '2g'",
         cd
     );
@@ -231,7 +225,7 @@ fn test_si_prefix_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          file-count-soft-limit = 1",
         cd
     );
@@ -240,7 +234,7 @@ fn test_si_prefix_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          file-count-soft-limit = '-31337'",
         cd
     );
@@ -249,7 +243,7 @@ fn test_si_prefix_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          file-count-soft-limit = '3.14M'",
         cd
     );
@@ -262,7 +256,7 @@ fn test_disk_space_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-soft-limit = '76'",
         cd
     );
@@ -273,7 +267,7 @@ fn test_disk_space_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-soft-limit = '42 Mi'",
         cd
     );
@@ -284,7 +278,7 @@ fn test_disk_space_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-soft-limit = '2 Gi'",
         cd
     );
@@ -295,7 +289,7 @@ fn test_disk_space_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-soft-limit = '31337 Ti'",
         cd
     );
@@ -306,7 +300,7 @@ fn test_disk_space_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-soft-limit = '7 Pi'",
         cd
     );
@@ -317,7 +311,7 @@ fn test_disk_space_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-soft-limit = '7M'",
         cd
     );
@@ -329,7 +323,7 @@ fn test_disk_space_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-soft-limit = '7 mi'",
         cd
     );
@@ -338,7 +332,7 @@ fn test_disk_space_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-soft-limit = 1",
         cd
     );
@@ -347,7 +341,7 @@ fn test_disk_space_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-soft-limit = '-31337'",
         cd
     );
@@ -356,7 +350,7 @@ fn test_disk_space_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-soft-limit = '3.14Ki'",
         cd
     );
@@ -369,7 +363,7 @@ fn test_duration_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          cleanup-interval = '100s'\n\
          optimizing-compression-task-timeout = '3m'\n\
          allowed-clock-drift-for-files-from-future = '4h'",
@@ -390,7 +384,7 @@ fn test_duration_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          cleanup-interval = '2d'\n\
          optimizing-compression-task-timeout = '333 m'",
         cd
@@ -410,7 +404,7 @@ fn test_duration_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          optimizing-compression-task-timeout = '333'",
         cd
     );
@@ -419,7 +413,7 @@ fn test_duration_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          optimizing-compression-task-timeout = 333",
         cd
     );
@@ -428,7 +422,7 @@ fn test_duration_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          optimizing-compression-task-timeout = '10 M'",
         cd
     );
@@ -437,7 +431,7 @@ fn test_duration_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          optimizing-compression-task-timeout = '10 min'",
         cd
     );
@@ -446,7 +440,7 @@ fn test_duration_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          optimizing-compression-task-timeout = '-10s'",
         cd
     );
@@ -455,7 +449,7 @@ fn test_duration_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          optimizing-compression-task-timeout = '1.5m'",
         cd
     );
@@ -468,7 +462,7 @@ fn test_percent_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          file-count-limit-percent-if-deleting = '62%'\n\
          files-total-size-limit-percent-if-deleting = '23 %'",
         cd
@@ -482,7 +476,7 @@ fn test_percent_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-limit-percent-if-deleting = '23'",
         cd
     );
@@ -491,7 +485,7 @@ fn test_percent_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-limit-percent-if-deleting = '22.5%'",
         cd
     );
@@ -500,7 +494,7 @@ fn test_percent_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-limit-percent-if-deleting = '0.5'",
         cd
     );
@@ -509,7 +503,7 @@ fn test_percent_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-limit-percent-if-deleting = '-1%'",
         cd
     );
@@ -518,7 +512,7 @@ fn test_percent_settings() {
         cp,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          files-total-size-limit-percent-if-deleting = '101%'",
         cd
     );
diff --git a/crates/cache/src/tests.rs b/crates/cache/src/tests.rs
index 4362aaba2222..7866802272df 100644
--- a/crates/cache/src/tests.rs
+++ b/crates/cache/src/tests.rs
@@ -15,9 +15,9 @@ fn test_cache_init() {
     let config_content = format!(
         "[cache]\n\
          enabled = true\n\
-         directory = {}\n\
+         directory = '{}'\n\
          baseline-compression-level = {}\n",
-        toml::to_string_pretty(&format!("{}", cache_dir.display())).unwrap(),
+        cache_dir.display(),
         baseline_compression_level,
     );
     fs::write(&config_path, config_content).expect("Failed to write test config file");
@@ -47,7 +47,7 @@ fn test_write_read_cache() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          baseline-compression-level = 3\n",
         cache_dir
     );
diff --git a/crates/cache/src/worker.rs b/crates/cache/src/worker.rs
index 64eff12f3897..5aed7066e93d 100644
--- a/crates/cache/src/worker.rs
+++ b/crates/cache/src/worker.rs
@@ -728,7 +728,7 @@ impl WorkerThread {
 }
 
 fn read_stats_file(path: &Path) -> Option<ModuleCacheStatistics> {
-    fs::read(path)
+    fs::read_to_string(path)
         .map_err(|err| {
             trace!(
                 "Failed to read stats file, path: {}, err: {}",
@@ -736,8 +736,8 @@ fn read_stats_file(path: &Path) -> Option<ModuleCacheStatistics> {
                 err
             )
         })
-        .and_then(|bytes| {
-            toml::from_slice::<ModuleCacheStatistics>(&bytes[..]).map_err(|err| {
+        .and_then(|contents| {
+            toml::from_str::<ModuleCacheStatistics>(&contents).map_err(|err| {
                 trace!(
                     "Failed to parse stats file, path: {}, err: {}",
                     path.display(),
diff --git a/crates/cache/src/worker/tests.rs b/crates/cache/src/worker/tests.rs
index d2652c6c2d28..2ab58f4522d4 100644
--- a/crates/cache/src/worker/tests.rs
+++ b/crates/cache/src/worker/tests.rs
@@ -15,7 +15,7 @@ fn test_on_get_create_stats_file() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}",
+         directory = '{cache_dir}'",
         cache_dir
     );
     assert!(cache_config.enabled());
@@ -42,7 +42,7 @@ fn test_on_get_update_usage_counter() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '16'",
         cache_dir
     );
@@ -76,7 +76,7 @@ fn test_on_get_recompress_no_mod_file() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '16'\n\
          baseline-compression-level = 3\n\
          optimized-compression-level = 7\n\
@@ -118,7 +118,7 @@ fn test_on_get_recompress_with_mod_file() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '16'\n\
          baseline-compression-level = 3\n\
          optimized-compression-level = 7\n\
@@ -193,7 +193,7 @@ fn test_on_get_recompress_lock() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '16'\n\
          baseline-compression-level = 3\n\
          optimized-compression-level = 7\n\
@@ -263,7 +263,7 @@ fn test_on_update_fresh_stats_file() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '16'\n\
          baseline-compression-level = 3\n\
          optimized-compression-level = 7\n\
@@ -312,7 +312,7 @@ fn test_on_update_cleanup_limits_trash_locks() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '16'\n\
          cleanup-interval = '30m'\n\
          optimizing-compression-task-timeout = '30m'\n\
@@ -453,7 +453,7 @@ fn test_on_update_cleanup_lru_policy() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '16'\n\
          file-count-soft-limit = '5'\n\
          files-total-size-soft-limit = '30K'\n\
@@ -585,7 +585,7 @@ fn test_on_update_cleanup_future_files() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '16'\n\
          allowed-clock-drift-for-files-from-future = '1d'\n\
          file-count-soft-limit = '3'\n\
@@ -693,7 +693,7 @@ fn test_on_update_cleanup_self_lock() {
         config_path,
         "[cache]\n\
          enabled = true\n\
-         directory = {cache_dir}\n\
+         directory = '{cache_dir}'\n\
          worker-event-queue-size = '16'\n\
          cleanup-interval = '30m'\n\
          allowed-clock-drift-for-files-from-future = '1d'",
diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml
index 803260954b75..cb471956bb38 100644
--- a/crates/environ/Cargo.toml
+++ b/crates/environ/Cargo.toml
@@ -16,7 +16,7 @@ workspace = true
 [dependencies]
 anyhow = { workspace = true }
 bincode = "1.2.1"
-cpp_demangle = { version = "0.3.2", optional = true }
+cpp_demangle = { version = "0.4.3", optional = true }
 cranelift-entity = { workspace = true }
 wasmtime-types = { workspace = true }
 wasmparser = { workspace = true }
diff --git a/crates/test-programs/artifacts/Cargo.toml b/crates/test-programs/artifacts/Cargo.toml
index e1328abe8a1c..e87f837b2c6f 100644
--- a/crates/test-programs/artifacts/Cargo.toml
+++ b/crates/test-programs/artifacts/Cargo.toml
@@ -12,4 +12,4 @@ workspace = true
 [build-dependencies]
 heck = { workspace = true }
 wit-component = { workspace = true }
-cargo_metadata = "0.15.3"
+cargo_metadata = "0.18.1"
diff --git a/crates/wasi/src/preview2/preview1.rs b/crates/wasi/src/preview2/preview1.rs
index 6760097efa9b..2b1ddc95eb39 100644
--- a/crates/wasi/src/preview2/preview1.rs
+++ b/crates/wasi/src/preview2/preview1.rs
@@ -780,8 +780,7 @@ fn write_bytes<'a>(
 ) -> Result<GuestPtr<'a, u8>, types::Error> {
     // NOTE: legacy implementation always returns Inval errno
 
-    let buf = buf.as_ref();
-    let len = buf.len().try_into()?;
+    let len = u32::try_from(buf.len())?;
 
     let ptr = ptr.borrow();
     ptr.as_array(len).copy_from_slice(buf)?;
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 37c81805a5c2..ee97d63d95d5 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -996,6 +996,12 @@ criteria = "safe-to-deploy"
 version = "0.15.3"
 notes = "no build, no unsafe, inputs to cargo command are reasonably sanitized"
 
+[[audits.cargo_metadata]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+delta = "0.17.0 -> 0.18.1"
+notes = "No major changes, no unsafe code here."
+
 [[audits.cast]]
 who = "Alex Crichton <alex@alexcrichton.com>"
 criteria = "safe-to-run"
@@ -1055,6 +1061,12 @@ The changes here are all typical bindings updates: new functions, types, and
 constants. I have not audited all the bindings for ABI conformance.
 """
 
+[[audits.cpp_demangle]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+delta = "0.3.5 -> 0.4.3"
+notes = "No substantive changes to `unsafe` code and otherwise all looks good."
+
 [[audits.cpufeatures]]
 who = "Alex Crichton <alex@alexcrichton.com>"
 criteria = "safe-to-deploy"
@@ -3246,6 +3258,12 @@ user-id = 6743 # Ed Page (epage)
 start = "2022-04-15"
 end = "2024-07-06"
 
+[[trusted.cpp_demangle]]
+criteria = "safe-to-deploy"
+user-id = 696 # Nick Fitzgerald (fitzgen)
+start = "2019-07-30"
+end = "2025-02-12"
+
 [[trusted.equivalent]]
 criteria = "safe-to-deploy"
 user-id = 539 # Josh Stone (cuviper)
@@ -3426,6 +3444,12 @@ user-id = 3618 # David Tolnay (dtolnay)
 start = "2019-02-28"
 end = "2024-07-06"
 
+[[trusted.serde_spanned]]
+criteria = "safe-to-deploy"
+user-id = 6743 # Ed Page (epage)
+start = "2023-01-20"
+end = "2025-02-12"
+
 [[trusted.syn]]
 criteria = "safe-to-deploy"
 user-id = 3618 # David Tolnay (dtolnay)
@@ -3468,6 +3492,24 @@ user-id = 1 # Alex Crichton (alexcrichton)
 start = "2019-05-16"
 end = "2024-07-06"
 
+[[trusted.toml]]
+criteria = "safe-to-deploy"
+user-id = 6743 # Ed Page (epage)
+start = "2022-12-14"
+end = "2025-02-12"
+
+[[trusted.toml_datetime]]
+criteria = "safe-to-deploy"
+user-id = 6743 # Ed Page (epage)
+start = "2022-10-21"
+end = "2025-02-12"
+
+[[trusted.toml_edit]]
+criteria = "safe-to-deploy"
+user-id = 6743 # Ed Page (epage)
+start = "2021-09-13"
+end = "2025-02-12"
+
 [[trusted.walkdir]]
 criteria = "safe-to-deploy"
 user-id = 189 # Andrew Gallant (BurntSushi)
@@ -3582,6 +3624,12 @@ user-id = 64539 # Kenny Kerr (kennykerr)
 start = "2021-10-27"
 end = "2024-06-17"
 
+[[trusted.winnow]]
+criteria = "safe-to-deploy"
+user-id = 6743 # Ed Page (epage)
+start = "2023-02-22"
+end = "2025-02-12"
+
 [[trusted.winx]]
 criteria = "safe-to-deploy"
 user-id = 6825 # Dan Gohman (sunfishcode)
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 81a4a889ba94..b4cc454f488a 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -890,6 +890,13 @@ user-id = 3618
 user-login = "dtolnay"
 user-name = "David Tolnay"
 
+[[publisher.serde_spanned]]
+version = "0.6.5"
+when = "2023-12-19"
+user-id = 6743
+user-login = "epage"
+user-name = "Ed Page"
+
 [[publisher.spdx]]
 version = "0.10.1"
 when = "2023-04-06"
@@ -946,11 +953,25 @@ user-login = "dtolnay"
 user-name = "David Tolnay"
 
 [[publisher.toml]]
-version = "0.5.7"
-when = "2020-10-11"
-user-id = 1
-user-login = "alexcrichton"
-user-name = "Alex Crichton"
+version = "0.8.10"
+when = "2024-02-05"
+user-id = 6743
+user-login = "epage"
+user-name = "Ed Page"
+
+[[publisher.toml_datetime]]
+version = "0.6.5"
+when = "2023-10-23"
+user-id = 6743
+user-login = "epage"
+user-name = "Ed Page"
+
+[[publisher.toml_edit]]
+version = "0.22.4"
+when = "2024-02-06"
+user-id = 6743
+user-login = "epage"
+user-name = "Ed Page"
 
 [[publisher.unicode-segmentation]]
 version = "1.10.1"
@@ -1481,6 +1502,13 @@ user-id = 64539
 user-login = "kennykerr"
 user-name = "Kenny Kerr"
 
+[[publisher.winnow]]
+version = "0.5.39"
+when = "2024-02-06"
+user-id = 6743
+user-login = "epage"
+user-name = "Ed Page"
+
 [[publisher.winx]]
 version = "0.36.3"
 when = "2023-12-01"
@@ -1545,6 +1573,18 @@ start = "2020-01-01"
 end = "2024-05-23"
 notes = "Maintained by Embark. No unsafe usage or ambient capabilities"
 
+[[audits.embark-studios.audits.cargo_metadata]]
+who = "Johan Andersson <opensource@embark-studios.com>"
+criteria = "safe-to-deploy"
+delta = "0.15.3 -> 0.15.4"
+notes = "No notable changes"
+
+[[audits.embark-studios.audits.cargo_metadata]]
+who = "Johan Andersson <opensource@embark-studios.com>"
+criteria = "safe-to-deploy"
+delta = "0.15.4 -> 0.17.0"
+notes = "No notable changes"
+
 [[audits.embark-studios.audits.colorchoice]]
 who = "Johan Andersson <opensource@embark-studios.com>"
 criteria = "safe-to-deploy"