mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-07 07:27:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: Rename BackingStore::Error to BackingStore::LockingError.

Browse Source 
The idea is to avoid name conflicts when implementing other traits
that use the `Error` associated type.
This commit is contained in:
Ivan Enderlin
2024-10-30 11:06:15 +01:00
parent e5d4ea5964
commit 9f11bced10
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/matrix-sdk-common/src/store_locks.rs
View File

@@ -58,7 +58,7 @@ use crate::{
#[cfg_attr(target_arch = "wasm32", async_trait::async_trait(?Send))]
#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
pub trait BackingStore {
type Error: Error + Send + Sync;
type LockError: Error + Send + Sync;
/// Try to take a lock using the given store.
async fn try_lock(
@@ -66,7 +66,7 @@ pub trait BackingStore {
lease_duration_ms: u32,
key: &str,
holder: &str,
) -> Result<bool, Self::Error>;
) -> Result<bool, Self::LockError>;
}
/// Small state machine to handle wait times.
@@ -400,7 +400,7 @@ mod tests {
#[cfg_attr(target_arch = "wasm32", async_trait::async_trait(?Send))]
#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
impl BackingStore for TestStore {
type Error = DummyError;
type LockError = DummyError;
/// Try to take a lock using the given store.
async fn try_lock(
@@ -408,7 +408,7 @@ mod tests {
lease_duration_ms: u32,
key: &str,
holder: &str,
) -> Result<bool, Self::Error> {
) -> Result<bool, Self::LockError> {
Ok(self.try_take_leased_lock(lease_duration_ms, key, holder))
}
}

4
crates/matrix-sdk-crypto/src/store/mod.rs
View File

@@ -1925,14 +1925,14 @@ pub struct LockableCryptoStore(Arc<dyn CryptoStore<Error = CryptoStoreError>>);
#[cfg_attr(target_arch = "wasm32", async_trait::async_trait(?Send))]
#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
impl matrix_sdk_common::store_locks::BackingStore for LockableCryptoStore {
type Error = CryptoStoreError;
type LockError = CryptoStoreError;
async fn try_lock(
&self,
lease_duration_ms: u32,
key: &str,
holder: &str,
) -> std::result::Result<bool, Self::Error> {
) -> std::result::Result<bool, Self::LockError> {
self.0.try_take_leased_lock(lease_duration_ms, key, holder).await
}
}