Merge pull request #321 from mstange/update-fs4-and-symsrv

Update fs4 and symsrv.
mstange · Jul 30, 2024 · e091d19 · e091d19
2 parents d59157c + 499ec61
commit e091d19
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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"