| @@ -2780,9 +2780,10 @@ dependencies = [ | |||||
| ] | ] | ||||
| [[package]] | [[package]] | ||||
| name = "raw_sync" | |||||
| name = "raw_sync_2" | |||||
| version = "0.1.5" | version = "0.1.5" | ||||
| source = "git+https://github.com/cameronelliott/raw_sync-rs.git#b1d6e16381b498fe618e5c1a1d1f2b1d2e6ef019" | |||||
| source = "registry+https://github.com/rust-lang/crates.io-index" | |||||
| checksum = "f067b45fa17e31d15636789c2638bd562da5496d498876cf0495df78f7e4fdcb" | |||||
| dependencies = [ | dependencies = [ | ||||
| "cfg-if", | "cfg-if", | ||||
| "libc", | "libc", | ||||
| @@ -3252,7 +3253,7 @@ version = "0.2.0-rc-7" | |||||
| dependencies = [ | dependencies = [ | ||||
| "bincode", | "bincode", | ||||
| "eyre", | "eyre", | ||||
| "raw_sync", | |||||
| "raw_sync_2", | |||||
| "serde", | "serde", | ||||
| "shared_memory", | "shared_memory", | ||||
| "tracing", | "tracing", | ||||
| @@ -13,6 +13,7 @@ eyre = "0.6.8" | |||||
| serde = { version = "1.0.152", features = ["derive"] } | serde = { version = "1.0.152", features = ["derive"] } | ||||
| shared_memory = "0.12.0" | shared_memory = "0.12.0" | ||||
| # TODO use upstream release once https://github.com/elast0ny/raw_sync-rs/pull/29 is merged | # TODO use upstream release once https://github.com/elast0ny/raw_sync-rs/pull/29 is merged | ||||
| raw_sync = { git = "https://github.com/cameronelliott/raw_sync-rs.git" } | |||||
| # Current fix, use personally pushed `raw_sync_2` version. | |||||
| raw_sync_2 = "0.1.5" | |||||
| bincode = "1.3.3" | bincode = "1.3.3" | ||||
| tracing = "0.1.37" | tracing = "0.1.37" | ||||
| @@ -1,5 +1,5 @@ | |||||
| use eyre::{eyre, Context}; | use eyre::{eyre, Context}; | ||||
| use raw_sync::events::{Event, EventImpl, EventInit, EventState}; | |||||
| use raw_sync_2::events::{Event, EventImpl, EventInit, EventState}; | |||||
| use serde::{Deserialize, Serialize}; | use serde::{Deserialize, Serialize}; | ||||
| use shared_memory::Shmem; | use shared_memory::Shmem; | ||||
| use std::{ | use std::{ | ||||
| @@ -130,8 +130,8 @@ impl ShmemChannel { | |||||
| &self.client_event | &self.client_event | ||||
| }; | }; | ||||
| let timeout = timeout | let timeout = timeout | ||||
| .map(raw_sync::Timeout::Val) | |||||
| .unwrap_or(raw_sync::Timeout::Infinite); | |||||
| .map(raw_sync_2::Timeout::Val) | |||||
| .unwrap_or(raw_sync_2::Timeout::Infinite); | |||||
| event | event | ||||
| .wait(timeout) | .wait(timeout) | ||||
| .map_err(|err| eyre!("failed to receive from ShmemChannel: {err}"))?; | .map_err(|err| eyre!("failed to receive from ShmemChannel: {err}"))?; | ||||