From 5f85ceb5f1d03c7b979acacc8372dd8e50a60367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Klaehn?= Date: Mon, 31 Jan 2022 10:51:32 +0100 Subject: [PATCH 1/2] Minor rkyv version update... and fix resulting compile error. --- Cargo.lock | 8 ++++---- crdt/src/radixdb.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fd4ae44..9d3f8d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3597,9 +3597,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.28" +version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631f7d2a2854abb66724f492ce5256e79685a673dc210ac022194cedd5c914d3" +checksum = "439655b8d657bcb28264da8e5380d55549e34ffc4149bea9e3521890a122a7bd" dependencies = [ "bytecheck", "hashbrown", @@ -3611,9 +3611,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.28" +version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c067e650861a749720952aed722fb344449bc95de33e6456d426f5c7d44f71c0" +checksum = "cded413ad606a80291ca84bedba137093807cf4f5b36be8c60f57a7e790d48f6" dependencies = [ "proc-macro2", "quote", diff --git a/crdt/src/radixdb.rs b/crdt/src/radixdb.rs index 46662b0..ac5a74c 100644 --- a/crdt/src/radixdb.rs +++ b/crdt/src/radixdb.rs @@ -87,7 +87,7 @@ impl Fallible for SharedSerializeMap2 { } impl SharedSerializeRegistry for SharedSerializeMap2 { - fn get_shared_ptr(&mut self, value: *const u8) -> Option { + fn get_shared_ptr(&self, value: *const u8) -> Option { self.shared_resolvers.get(&value).copied() } From 513c959529fb368d61374dbf84a2e37cbf2051d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Klaehn?= Date: Mon, 31 Jan 2022 11:04:55 +0100 Subject: [PATCH 2/2] clippy --- crdt/src/doc.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crdt/src/doc.rs b/crdt/src/doc.rs index 04f3a2c..706dfd3 100644 --- a/crdt/src/doc.rs +++ b/crdt/src/doc.rs @@ -66,7 +66,7 @@ impl Docs { pub fn docs(&self) -> impl Iterator> + '_ { self.0.iter().filter_map(|(k, _)| { if k[32] == 1 { - Some(Ok(DocId::new((&k[..32]).try_into().unwrap()))) + Some(Ok(DocId::new(k[..32].try_into().unwrap()))) } else { None } @@ -76,7 +76,7 @@ impl Docs { pub fn keys(&self) -> impl Iterator> + '_ { self.0.iter().filter_map(|(k, _)| { if k[32] == 2 { - Some(Ok(PeerId::new((&k[..32]).try_into().unwrap()))) + Some(Ok(PeerId::new(k[..32].try_into().unwrap()))) } else { None }