From 1a8fb458a9f3b30b6975327d79d7c844ecfa0c2f Mon Sep 17 00:00:00 2001 From: Zixuan Chen Date: Sun, 6 Nov 2022 23:17:08 +0800 Subject: [PATCH] chore: use stable rust as GAT become stable --- Cargo.lock | 47 ------------------------------------- README.md | 2 -- crates/loro-core/Cargo.toml | 11 --------- rust-toolchain | 2 +- 4 files changed, 1 insertion(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8332ad21..bcf0af09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -434,12 +434,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "fs_extra" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" - [[package]] name = "fxhash" version = "0.2.1" @@ -624,9 +618,6 @@ dependencies = [ "string_cache", "tabled", "thiserror", - "tikv-jemalloc-ctl", - "tikv-jemalloc-sys", - "tikv-jemallocator", "wasm-bindgen", ] @@ -859,12 +850,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "paste" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" - [[package]] name = "phf_shared" version = "0.10.0" @@ -1430,38 +1415,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" -[[package]] -name = "tikv-jemalloc-ctl" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" -dependencies = [ - "libc", - "paste", - "tikv-jemalloc-sys", -] - -[[package]] -name = "tikv-jemalloc-sys" -version = "0.5.2+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" -dependencies = [ - "cc", - "fs_extra", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - [[package]] name = "tinytemplate" version = "1.2.1" diff --git a/README.md b/README.md index 5f79b0fa..7197fbff 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,3 @@ # Dev -we use nightly rust due to GAT in crdt-list. we can use stable rust when GAT is -stable diff --git a/crates/loro-core/Cargo.toml b/crates/loro-core/Cargo.toml index e99e5d82..d897e29f 100644 --- a/crates/loro-core/Cargo.toml +++ b/crates/loro-core/Cargo.toml @@ -40,17 +40,6 @@ ctor = "0.1.23" criterion = "0.4.0" serde_json = "1.0.87" flate2 = "1.0.24" -tikv-jemalloc-ctl = "0.5.0" -tikv-jemalloc-sys = { version = "0.5.0", features = [ - "stats", - "profiling", - "unprefixed_malloc_on_supported_platforms", -] } -tikv-jemallocator = { version = "0.5.0", features = [ - "stats", - "profiling", - "unprefixed_malloc_on_supported_platforms", -] } # See https://matklad.github.io/2021/02/27/delete-cargo-integration-tests.html diff --git a/rust-toolchain b/rust-toolchain index bf867e0a..2bf5ad04 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly +stable