mirror of
https://github.com/loro-dev/loro.git
synced 2025-01-23 05:24:51 +00:00
chore: cargo fix
This commit is contained in:
parent
af26c9d782
commit
5686a37f09
10 changed files with 22 additions and 34 deletions
|
@ -5,10 +5,9 @@
|
|||
//! Every [Container] can take a [Snapshot], which contains [crate::LoroValue] that describes the state.
|
||||
//!
|
||||
use crate::{
|
||||
op::{Content, Op, RemoteOp, RichOp},
|
||||
span::IdSpan,
|
||||
op::{RemoteOp, RichOp},
|
||||
version::{IdSpanVector, VersionVector},
|
||||
InternalString, LogStore, LoroValue, ID,
|
||||
InternalString, LoroValue, ID,
|
||||
};
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
|
@ -3,7 +3,6 @@ use std::sync::{Arc, Mutex};
|
|||
use fxhash::FxHashMap;
|
||||
|
||||
use crate::{
|
||||
change::Lamport,
|
||||
container::{
|
||||
registry::{ContainerInstance, ContainerWrapper},
|
||||
Container, ContainerID, ContainerType,
|
||||
|
@ -11,10 +10,10 @@ use crate::{
|
|||
context::Context,
|
||||
op::RemoteOp,
|
||||
op::{Content, Op, RichOp},
|
||||
span::{HasLamport, IdSpan},
|
||||
span::{HasLamport},
|
||||
value::LoroValue,
|
||||
version::{IdSpanVector, TotalOrderStamp},
|
||||
InternalString, LogStore,
|
||||
InternalString,
|
||||
};
|
||||
|
||||
use super::MapSet;
|
||||
|
|
|
@ -12,9 +12,7 @@ use crate::{
|
|||
context::Context,
|
||||
id::ContainerIdx,
|
||||
op::{RemoteOp, RichOp},
|
||||
span::IdSpan,
|
||||
version::IdSpanVector,
|
||||
LogStore, LoroValue, VersionVector,
|
||||
version::IdSpanVector, LoroValue, VersionVector,
|
||||
};
|
||||
|
||||
use super::{
|
||||
|
|
|
@ -20,7 +20,6 @@ use crate::{
|
|||
span::{HasCounterSpan, HasId, HasIdSpan, IdSpan},
|
||||
value::LoroValue,
|
||||
version::IdSpanVector,
|
||||
LogStore,
|
||||
};
|
||||
|
||||
use super::{
|
||||
|
|
|
@ -24,7 +24,6 @@ mod test;
|
|||
|
||||
use crate::{
|
||||
change::Lamport,
|
||||
debug_log,
|
||||
id::{ClientID, Counter, ID},
|
||||
span::{CounterSpan, HasId, HasIdSpan, HasLamport, HasLamportSpan, IdSpan},
|
||||
version::{IdSpanVector, VersionVector, VersionVectorDiff},
|
||||
|
|
|
@ -668,7 +668,7 @@ mod find_path {
|
|||
|
||||
#[test]
|
||||
fn proptest_path_large(
|
||||
interactions in prop::collection::vec(gen_interaction(10), 0..1 * PROPTEST_FACTOR_10 * PROPTEST_FACTOR_10 + 10),
|
||||
interactions in prop::collection::vec(gen_interaction(10), 0..PROPTEST_FACTOR_10 * PROPTEST_FACTOR_10 + 10),
|
||||
) {
|
||||
test_find_path(10, interactions)?;
|
||||
}
|
||||
|
|
|
@ -363,10 +363,8 @@ where
|
|||
candidates.drain(0..30);
|
||||
}
|
||||
}
|
||||
if start.elapsed().as_secs() > 10 {
|
||||
if minified.len() <= 4 {
|
||||
break;
|
||||
}
|
||||
if start.elapsed().as_secs() > 10 && minified.len() <= 4 {
|
||||
break;
|
||||
}
|
||||
if start.elapsed().as_secs() > 60 {
|
||||
break;
|
||||
|
|
|
@ -9,7 +9,7 @@ use std::{
|
|||
sync::{Arc, Mutex, MutexGuard, RwLock},
|
||||
};
|
||||
|
||||
use fxhash::{FxHashMap, FxHashSet};
|
||||
use fxhash::{FxHashMap};
|
||||
|
||||
use rle::{HasLength, RleVec, RleVecWithIndex, Sliceable};
|
||||
|
||||
|
@ -22,12 +22,11 @@ use crate::{
|
|||
registry::{ContainerInstance, ContainerRegistry},
|
||||
Container, ContainerID,
|
||||
},
|
||||
dag::{remove_included_frontiers, Dag, DagUtils},
|
||||
dag::{Dag, DagUtils},
|
||||
debug_log,
|
||||
id::{ClientID, ContainerIdx, Counter},
|
||||
op::{Content, RemoteOp, RichOp},
|
||||
span::{HasCounter, HasCounterSpan, HasIdSpan, HasLamportSpan, IdSpan},
|
||||
version::are_frontiers_eq,
|
||||
op::{Content, RemoteOp},
|
||||
span::{HasCounterSpan, HasIdSpan, IdSpan},
|
||||
ContainerType, Lamport, Op, Timestamp, VersionVector, ID,
|
||||
};
|
||||
|
||||
|
|
|
@ -1,28 +1,25 @@
|
|||
use crate::{LogStore, LoroCore};
|
||||
use crate::{LogStore};
|
||||
use std::{
|
||||
marker::PhantomPinned,
|
||||
ops::ControlFlow,
|
||||
sync::{Arc, Mutex, MutexGuard, RwLock},
|
||||
sync::{MutexGuard},
|
||||
};
|
||||
|
||||
use fxhash::{FxHashMap, FxHashSet};
|
||||
use fxhash::{FxHashMap};
|
||||
|
||||
use rle::{HasLength, RleVecWithIndex, Sliceable};
|
||||
|
||||
use rle::{HasLength, RleVec, RleVecWithIndex, Sliceable};
|
||||
|
||||
use smallvec::SmallVec;
|
||||
|
||||
use crate::{
|
||||
change::{Change, ChangeMergeCfg},
|
||||
configure::Configure,
|
||||
container::{
|
||||
registry::{ContainerInstance, ContainerRegistry},
|
||||
registry::{ContainerInstance},
|
||||
Container, ContainerID,
|
||||
},
|
||||
dag::{remove_included_frontiers, Dag, DagUtils},
|
||||
debug_log,
|
||||
id::{ClientID, ContainerIdx, Counter},
|
||||
op::{Content, RemoteOp, RichOp},
|
||||
span::{HasCounter, HasCounterSpan, HasIdSpan, HasLamportSpan, IdSpan},
|
||||
id::{ContainerIdx},
|
||||
op::{RichOp},
|
||||
span::{HasCounter, HasIdSpan, HasLamportSpan, IdSpan},
|
||||
version::are_frontiers_eq,
|
||||
VersionVector,
|
||||
};
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use crate::Op;
|
||||
|
||||
use crate::id::ClientID;
|
||||
use crate::id::ContainerIdx;
|
||||
|
||||
use crate::op::RichOp;
|
||||
|
||||
use crate::span::HasId;
|
||||
|
|
Loading…
Reference in a new issue