Skip to content

Commit c3d70ac

Browse files
committed
chore: merge main
1 parent dd0f286 commit c3d70ac

4 files changed

Lines changed: 26 additions & 24 deletions

File tree

Cargo.lock

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/loro-internal/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pretty_assertions = "1.4.1"
5656
thread_local = "1.1.8"
5757

5858
[target.'cfg(loom)'.dependencies]
59-
loom = { version= "0.7", features = ["checkpoint"] }
59+
loom = { version = "0.7", features = ["checkpoint"] }
6060

6161
[lints.rust]
6262
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(loom)'] }

crates/loro-internal/src/arena/str_arena.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ mod test {
191191
fn slice_long_unicode_correctly() {
192192
let mut arena = StrArena::default();
193193
let src = "一二34567八九零";
194-
for s in std::iter::repeat(src).take(100) {
194+
for s in std::iter::repeat_n(src, 100) {
195195
arena.alloc(s);
196196
}
197197

crates/loro/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ keywords = ["crdt", "local-first"]
1515

1616
[dependencies]
1717
loro-internal = { path = "../loro-internal", version = "1.5.1" }
18-
loro-common = { path = "../loro-common", version = "1.4.7", features = ["serde_json"] }
18+
loro-common = { path = "../loro-common", version = "1.4.7", features = [
19+
"serde_json",
20+
] }
1921
loro-kv-store = { path = "../kv-store", version = "1.4.7" }
20-
delta = { path = "../delta", package = "loro-delta", version = "1.5.1" }
22+
delta = { path = "../delta", package = "loro-delta", version = "1.5.0" }
2123
generic-btree = { version = "^0.10.5" }
2224
enum-as-inner = { workspace = true }
2325
tracing = { workspace = true }

0 commit comments

Comments
 (0)