ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

op heads: remove lifetime from OpHeadsStoreLock

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-12-27 23:22:55 -08:00 committed by Martin von Zweigbergk
parent c304777a35
commit f969f4b0b0
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/src/op_heads_store.rs
View file

@ -35,7 +35,7 @@ pub enum OpHeadResolutionError<E> {
Err(#[source] E),
}
pub trait OpHeadsStoreLock<'a> {}
pub trait OpHeadsStoreLock {}
/// Manages the set of current heads of the operation log.
pub trait OpHeadsStore: Send + Sync + Debug {
@ -54,7 +54,11 @@ pub trait OpHeadsStore: Send + Sync + Debug {
fn get_op_heads(&self) -> Vec<OperationId>;
fn lock<'a>(&'a self) -> Box<dyn OpHeadsStoreLock<'a> + 'a>;
/// Optionally takes a lock on the op heads store. The purpose of the lock
/// is to prevent concurrent processes from resolving the same divergent
/// operations. It is not needed for correctness; implementations are free
/// to return a type that doesn't hold.
fn lock(&self) -> Box<dyn OpHeadsStoreLock + '_>;
/// Removes operations in the input that are ancestors of other operations
/// in the input. The ancestors are removed both from the list and from

4
lib/src/simple_op_heads_store.rs
View file

@ -56,7 +56,7 @@ struct SimpleOpHeadsStoreLock {
_lock: FileLock,
}
impl OpHeadsStoreLock<'_> for SimpleOpHeadsStoreLock {}
impl OpHeadsStoreLock for SimpleOpHeadsStoreLock {}
impl OpHeadsStore for SimpleOpHeadsStore {
fn name(&self) -> &str {
@ -94,7 +94,7 @@ impl OpHeadsStore for SimpleOpHeadsStore {
op_heads
}
fn lock<'a>(&'a self) -> Box<dyn OpHeadsStoreLock<'a> + 'a> {
fn lock(&self) -> Box<dyn OpHeadsStoreLock + '_> {
Box::new(SimpleOpHeadsStoreLock {
_lock: FileLock::lock(self.dir.join("lock")),
})