From 499ec616b574a8b41518d20b105086eca244f7ae Mon Sep 17 00:00:00 2001
From: Markus Stange <markus.stange@gmail.com>
Date: Tue, 30 Jul 2024 11:56:49 -0400
Subject: [PATCH] Update fs4 and symsrv.

---
 Cargo.lock                                    | 22 +++++++++++--------
 samply/Cargo.toml                             |  2 +-
 .../windows/utility_process/file_channel.rs   |  3 ++-
 wholesym/Cargo.toml                           |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 68ba07c0..e2e68921 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -676,9 +676,9 @@ dependencies = [
 
 [[package]]
 name = "fs4"
-version = "0.8.4"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8"
+checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de"
 dependencies = [
  "rustix",
  "windows-sys 0.52.0",
@@ -1522,9 +1522,13 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "2288c0e17cc8d342c712bb43a257a80ebffce59cdb33d5000d8348f3ec02528b"
+dependencies = [
+ "zerocopy",
+ "zerocopy-derive",
+]
 
 [[package]]
 name = "proc-macro2"
@@ -1988,7 +1992,7 @@ dependencies = [
  "tokio-util",
  "uname",
  "uuid",
- "which 6.0.1",
+ "which 6.0.2",
  "wholesym",
  "windows 0.58.0",
  "winver",
@@ -2193,9 +2197,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "symsrv"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc9eb3fb03ab32475d1107c2b3d2efcd48cb5e9278e7b39186598df7a049a1da"
+checksum = "fbc84816f92e67d3613ceccab0694df7b4a10514770ce5ab9c75b32de512ab53"
 dependencies = [
  "async-compression",
  "cab",
@@ -2676,9 +2680,9 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "6.0.1"
+version = "6.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7"
+checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075"
 dependencies = [
  "either",
  "home",
diff --git a/samply/Cargo.toml b/samply/Cargo.toml
index 7751bfc3..106c2cb9 100644
--- a/samply/Cargo.toml
+++ b/samply/Cargo.toml
@@ -49,7 +49,7 @@ ctrlc = "3.4.4"
 log = "0.4.21"
 env_logger = "0.11"
 cfg-if = "1.0.0"
-fs4 = "0.8.3"
+fs4 = "0.9"
 humantime = "2.1.0"
 shlex = "1.3.0"
 
diff --git a/samply/src/windows/utility_process/file_channel.rs b/samply/src/windows/utility_process/file_channel.rs
index fca3d40b..bd9e5825 100644
--- a/samply/src/windows/utility_process/file_channel.rs
+++ b/samply/src/windows/utility_process/file_channel.rs
@@ -24,7 +24,8 @@ use std::io::{Read, Write};
 use std::marker::PhantomData;
 use std::path::Path;
 
-use fs4::{lock_contended_error, FileExt};
+use fs4::fs_std::FileExt;
+use fs4::lock_contended_error;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 
diff --git a/wholesym/Cargo.toml b/wholesym/Cargo.toml
index 7c42a62c..8152dd8d 100644
--- a/wholesym/Cargo.toml
+++ b/wholesym/Cargo.toml
@@ -21,7 +21,7 @@ debugid = "0.8.0"
 samply-api = { version = "0.23.1", path = "../samply-api", features = ["send_futures"], optional = true }
 samply-symbols = { version = "0.23.0", path = "../samply-symbols", features = ["send_futures"] }
 # symsrv = { path = "../../symsrv" }
-symsrv = "0.5.1"
+symsrv = "0.5.2"
 yoke = "0.7"
 yoke-derive = "0.7"
 libc = "0.2.155"