mirrors/loro
1
0
Fork 0
mirror of https://github.com/loro-dev/loro.git synced 2024-11-28 17:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

chore: cargo fix

Browse source
This commit is contained in:
Zixuan Chen 2022-10-03 18:01:14 +08:00
parent ec596792f6
commit 33992626d2
8 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/loro-core/src/container/map/map_container.rs
View file

@ -10,7 +10,7 @@ use crate::{
op::{OpContent, OpProxy},
value::{InsertValue, LoroValue},
version::TotalOrderStamp,
InternalString, LogStore,
InternalString,
};
use super::MapInsertContent;

6
crates/loro-core/src/container/text/tracker.rs
View file

@ -81,13 +81,13 @@ impl Tracker {
*id,
*pos,
text.len(),
&mut |v, leaf| {
&mut |_v, _leaf| {
//TODO notify
},
);
}
TextOpContent::Delete { id, pos, len } => todo!(),
TextOpContent::Delete { id: _, pos: _, len: _ } => todo!(),
}
}
}
@ -103,7 +103,7 @@ mod test {
#[test]
fn test_turn_off() {
let mut tracker = Tracker::new();
let _tracker = Tracker::new();
// tracker.turn_off(IdSpan::new(1, 1, 2));
}
}

6
crates/loro-core/src/container/text/tracker/content_map.rs
View file

@ -1,5 +1,5 @@
use crdt_list::crdt::ListCrdt;
use crdt_list::yata::Yata;
use std::ops::{Deref, DerefMut};
use rle::{
@ -25,12 +25,12 @@ struct CursorWithId<'tree> {
impl ContentMap {
#[inline]
pub(super) fn insert_yspan_at_pos<F>(&mut self, id: ID, pos: usize, len: usize, notify: &mut F)
pub(super) fn insert_yspan_at_pos<F>(&mut self, id: ID, pos: usize, len: usize, _notify: &mut F)
where
F: FnMut(&YSpan, *const LeafNode<'_, YSpan, YSpanTreeTrait>),
{
let (left, right) = self.get_sibling_at(pos);
let yspan = YSpan {
let _yspan = YSpan {
origin_left: left.as_ref().map(|x| x.id).unwrap_or_else(ID::null),
origin_right: right.as_ref().map(|x| x.id).unwrap_or_else(ID::null),
id,

6
crates/loro-core/src/container/text/tracker/cursor_map.rs
View file

@ -27,7 +27,7 @@ pub(super) enum Marker {
impl Marker {
pub fn as_cursor(&self, id: ID) -> Option<SafeCursor<'_, 'static, YSpan, YSpanTreeTrait>> {
match self {
Marker::Insert { ptr, len } => {
Marker::Insert { ptr, len: _ } => {
// SAFETY: tree data is always valid
let node = unsafe { ptr.as_ref() };
debug_assert!(!node.is_deleted());
@ -44,7 +44,7 @@ impl Marker {
id: ID,
) -> Option<SafeCursorMut<'_, 'static, YSpan, YSpanTreeTrait>> {
match self {
Marker::Insert { ptr, len } => {
Marker::Insert { ptr, len: _ } => {
// SAFETY: tree data is always valid
let node = unsafe { ptr.as_ref() };
debug_assert!(!node.is_deleted());
@ -72,7 +72,7 @@ impl Sliceable for Marker {
impl HasLength for Marker {
fn len(&self) -> usize {
match self {
Marker::Insert { ptr, len } => *len,
Marker::Insert { ptr: _, len } => *len,
Marker::Delete(span) => span.len(),
}
}

17
crates/loro-core/src/container/text/tracker/yata.rs
View file

@ -4,7 +4,6 @@ use rle::rle_tree::{iter::IterMut, SafeCursorMut, RleTreeRaw};
use crate::id::ID;
use super::{
content_map::ContentMap,
y_span::{YSpan, YSpanTreeTrait},
Tracker, cursor_map::make_notify,
};
@ -13,11 +12,11 @@ use super::{
struct OpSpanSet {}
impl OpSet<YSpan, ID> for OpSpanSet {
fn insert(&mut self, value: &YSpan) {
fn insert(&mut self, _value: &YSpan) {
todo!()
}
fn contain(&self, id: ID) -> bool {
fn contain(&self, _id: ID) -> bool {
todo!()
}
@ -75,27 +74,27 @@ impl ListCrdt for YataImpl {
})
}
fn id(op: &Self::OpUnit) -> Self::OpId {
fn id(_op: &Self::OpUnit) -> Self::OpId {
todo!()
}
fn cmp_id(op_a: &Self::OpUnit, op_b: &Self::OpUnit) -> std::cmp::Ordering {
fn cmp_id(_op_a: &Self::OpUnit, _op_b: &Self::OpUnit) -> std::cmp::Ordering {
todo!()
}
fn contains(op: &Self::OpUnit, id: Self::OpId) -> bool {
fn contains(_op: &Self::OpUnit, _id: Self::OpId) -> bool {
todo!()
}
fn integrate(container: &mut Self::Container, op: Self::OpUnit) {
fn integrate(_container: &mut Self::Container, _op: Self::OpUnit) {
todo!()
}
fn can_integrate(container: &Self::Container, op: &Self::OpUnit) -> bool {
fn can_integrate(_container: &Self::Container, _op: &Self::OpUnit) -> bool {
todo!()
}
fn len(container: &Self::Container) -> usize {
fn len(_container: &Self::Container) -> usize {
todo!()
}
}

6
crates/loro-core/src/dag/test.rs
View file

@ -65,7 +65,7 @@ impl Dag for TestDag {
}
fn roots(&self) -> Vec<&Self::Node> {
self.nodes.iter().map(|(_, v)| &v[0]).collect()
self.nodes.values().map(|v| &v[0]).collect()
}
fn contains(&self, id: ID) -> bool {
@ -107,7 +107,7 @@ impl TestDag {
let deps = std::mem::replace(&mut self.frontier, vec![id]);
self.nodes
.entry(client_id)
.or_insert(vec![])
.or_default()
.push(TestNode::new(id, self.next_lamport, deps, len));
self.next_lamport += len as u32;
}
@ -162,7 +162,7 @@ impl TestDag {
);
self.nodes
.entry(client_id)
.or_insert(vec![])
.or_default()
.push(node.clone());
self.version_vec
.insert(client_id, node.id.counter + node.len as Counter);

2
crates/loro-core/src/loro.rs
View file

@ -1,4 +1,4 @@
use std::{pin::Pin, sync::RwLock};
use std::{pin::Pin};
use crate::{
configure::Configure,

4
crates/rle/src/rle_tree/node/internal_impl.rs
View file

@ -325,9 +325,7 @@ impl<'a, T: Rle, A: RleTreeTrait<T>> InternalNode<'a, T, A> {
};
if let Err(new) = new {
if let Err(value) = self._insert_with_split(child_index + 1, new) {
return Err(value);
}
self._insert_with_split(child_index + 1, new)?
}
Ok(())