chore: merge v1.4.7 (#701)

* fix: upgrade columnar

* chore: pre release rust 1.4.7

* chore: merge main

Author: Leeeon233

Cargo.lock

@@ -21,7 +21,7 @@ enum_dispatch = "0.3.11"
 enum-as-inner = "0.6.0"
 fxhash = "0.2.1"
 tracing = { version = "0.1" }
-serde_columnar = { version = "0.3.10" }
+serde_columnar = { version = "0.3.11" }
 serde_json = "1.0"
 thiserror = "1"
 smallvec = { version = "1.8.0", features = ["serde"] }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "loro-kv-store"
-version = "1.4.6"
+version = "1.4.7"
 edition = "2021"
 license = "MIT"
 description = "Key-value store component for Loro, a high-performance CRDTs framework"
@@ -10,7 +10,7 @@ authors = ["Liang Zhao", "Zixuan Chen"]
 
 
 [dependencies]
-loro-common = { path = "../loro-common", version = "1.4.6" }
+loro-common = { path = "../loro-common", version = "1.4.7" }
 bytes = { workspace = true }
 fxhash = { workspace = true }
 once_cell = { workspace = true }

crates/kv-store/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "loro-common"
-version = "1.4.6"
+version = "1.4.7"
 edition = "2021"
 license = "MIT"
 description = "Common types and functions for Loro. This is an internal lib of Loro."

crates/loro-common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "loro-internal"
-version = "1.5.0"
+version = "1.5.1"
 edition = "2021"
 license = "MIT"
 description = "Loro internal library. Do not use it directly as it's not stable."
@@ -18,11 +18,11 @@ generic-btree = { version = "^0.10.5" }
 smallvec = { workspace = true }
 loro-delta = { path = "../delta", version = "1.5.0", package = "loro-delta" }
 rle = { path = "../rle", version = "1.2.7", package = "loro-rle" }
-loro-common = { path = "../loro-common", version = "1.4.6" }
+loro-common = { path = "../loro-common", version = "1.4.7" }
 fractional_index = { path = "../fractional_index", features = [
     "serde",
 ], version = "1.2.7", package = "loro_fractional_index" }
-loro-kv-store = { path = "../kv-store", version = "1.4.6" }
+loro-kv-store = { path = "../kv-store", version = "1.4.7" }
 fxhash = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
@@ -56,7 +56,7 @@ pretty_assertions = "1.4.1"
 thread_local = "1.1.8"
 
 [target.'cfg(loom)'.dependencies]
-loom = { version= "0.7", features = ["checkpoint"] }
+loom = { version = "0.7", features = ["checkpoint"] }
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(loom)'] }

crates/loro-internal/Cargo.toml

@@ -191,7 +191,7 @@ mod test {
     fn slice_long_unicode_correctly() {
         let mut arena = StrArena::default();
         let src = "一二34567八九零";
-        for s in std::iter::repeat(src).take(100) {
+        for s in std::iter::repeat_n(src, 100) {
             arena.alloc(s);
         }
 

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

@@ -1,6 +1,6 @@
 [package]
 name = "loro"
-version = "1.5.0"
+version = "1.5.1"
 edition = "2021"
 license = "MIT"
 documentation = "https://docs.rs/loro/"
@@ -14,11 +14,11 @@ keywords = ["crdt", "local-first"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-loro-internal = { path = "../loro-internal", version = "1.5.0" }
-loro-common = { path = "../loro-common", version = "1.4.6", features = [
+loro-internal = { path = "../loro-internal", version = "1.5.1" }
+loro-common = { path = "../loro-common", version = "1.4.7", features = [
     "serde_json",
 ] }
-loro-kv-store = { path = "../kv-store", version = "1.4.6" }
+loro-kv-store = { path = "../kv-store", version = "1.4.7" }
 delta = { path = "../delta", package = "loro-delta", version = "1.5.0" }
 generic-btree = { version = "^0.10.5" }
 enum-as-inner = { workspace = true }