Skip to content

fix: replace unmaintained crate im with imbl (fixes RUSTSEC-2023-0126) #1122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
niclashoyer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: replace unmaintained crate im with imbl (fixes RUSTSEC-2023-0126) #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 68 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/loro-internal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ once_cell = { workspace = true }
arbitrary = { version = "1", optional = true }
postcard = { version = "1", default-features = false, features = ["use-std"] }
append-only-bytes = { version = "0.1.12", features = ["u32_range"] }
im = { version = "15.1.0", features = ["serde"] }
imbl = { version = "7.0.2", features = ["serde"] }
tabled = { version = "0.10.0", optional = true }
wasm-bindgen = { version = "=0.2.100", optional = true }
js-sys = { version = "0.3.60", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/loro-internal/src/dag/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![allow(unused)]
use arbitrary::Arbitrary;
use im::HashSet;
use imbl::HashSet;
use loro_common::HasCounter;
use std::{cmp::Ordering, sync::Arc};

Expand Down
13 changes: 11 additions & 2 deletions crates/loro-internal/src/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,14 @@ impl VersionRange {
/// can be created from cloning and modifying other similar version vectors.
#[repr(transparent)]
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
pub struct ImVersionVector(im::HashMap<PeerID, Counter, rustc_hash::FxBuildHasher>);
pub struct ImVersionVector(
imbl::GenericHashMap<
PeerID,
Counter,
rustc_hash::FxBuildHasher,
imbl::shared_ptr::DefaultSharedPtr,
>,
);

#[inline]
fn normalize_vv_counter(counter: Counter) -> Counter {
Expand Down Expand Up @@ -197,7 +204,9 @@ impl ImVersionVector {
self.0.is_empty()
}

pub fn iter(&self) -> im::hashmap::Iter<'_, PeerID, Counter> {
pub fn iter(
&self,
) -> imbl::hashmap::Iter<'_, PeerID, Counter, imbl::shared_ptr::DefaultSharedPtr> {
self.0.iter()
}

Expand Down
Loading