README

Author: phoepsilonix

.github/setup.yml

@@ -80,34 +80,34 @@
     case "${{ join(matrix.targets) }}" in
       *arm*linux*musl*)
         echo "cargo=cargo" >> $GITHUB_OUTPUT
-        echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+        echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
         ;;
       *aarch64*linux*musl*)
         echo "cargo=cargo" >> $GITHUB_OUTPUT
-        echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+        echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
         ;;
       *linux*musl*)
-        echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+        echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
         echo "cargo=cargo" >> $GITHUB_OUTPUT
         ;;
       *aarch64*linux*)
-        echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+        echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
         echo "cargo=cargo" >> $GITHUB_OUTPUT
         ;;
       *arm*linux*)
-        echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+        echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
         echo "cargo=cargo" >> $GITHUB_OUTPUT
         ;;
       *linux*)
-        echo "features=use-tcmalloc" >> $GITHUB_OUTPUT
+        echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
         echo "cargo=cargo" >> $GITHUB_OUTPUT
         ;;
       *aarch64*windows*)
-        echo "features=use-snmalloc" >> $GITHUB_OUTPUT
+        echo "features=" >> $GITHUB_OUTPUT
         echo "cargo=cargo-xwin" >> $GITHUB_OUTPUT
         ;;
       *windows*)
-        echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
+        echo "features=" >> $GITHUB_OUTPUT
         echo "cargo=cargo-xwin" >> $GITHUB_OUTPUT
         ;;
       *)

.github/workflows/release.yml

@@ -207,26 +207,26 @@ jobs:
           case "${{ join(matrix.targets) }}" in
             *arm*linux*musl*)
               echo "cargo=cargo" >> $GITHUB_OUTPUT
-              echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+              echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
               ;;
             *aarch64*linux*musl*)
               echo "cargo=cargo" >> $GITHUB_OUTPUT
-              echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+              echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
               ;;
             *linux*musl*)
-              echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+              echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
               echo "cargo=cargo" >> $GITHUB_OUTPUT
               ;;
             *aarch64*linux*)
-              echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+              echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
               echo "cargo=cargo" >> $GITHUB_OUTPUT
               ;;
             *arm*linux*)
-              echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+              echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
               echo "cargo=cargo" >> $GITHUB_OUTPUT
               ;;
             *linux*)
-              echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+              echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
               echo "cargo=cargo" >> $GITHUB_OUTPUT
               ;;
             *aarch64*windows*)
@@ -238,7 +238,7 @@ jobs:
               echo "cargo=cargo-xwin" >> $GITHUB_OUTPUT
               ;;
             *)
-              echo "features=use-jemalloc" >> $GITHUB_OUTPUT
+              echo "features=use-mimalloc-rs" >> $GITHUB_OUTPUT
               echo "cargo=cargo" >> $GITHUB_OUTPUT
               ;;
           esac

Cargo.toml

@@ -1,4 +1,3 @@
-#![target.'cfg_attr(feature = "unstable", feature(unstable))']
 #cargo-features = ["profile-rustflags"]
 
 [workspace]
@@ -111,7 +110,6 @@ hashbrown = { version = "^0.16" , features = [], default-features = false }
 #hashbrown = { version = "=0.14" , features = [], default-features = false }
 #hashbrown = { version = "^0.15" , features = [], default-features = false }
 
-#[target.'cfg(any(not(any(target_arch = "arm", target_arch = "aarch64")),all(target_arch = "aarch64", not(target_os = "windows"))))'.dependencies]
 mimalloc = { workspace = true , optional = true }
 snmalloc-rs = { workspace = true , optional = true }
 tcmalloc = { workspace = true , optional = true }

README.md

@@ -140,6 +140,15 @@ RUSTFLAGS="" cargo build --release -F use-snmalloc
 * ビルド時にcmakeが必要。
 
 ## リリース版の設定
+### v0.6.23
+| プラットフォーム | OS | メモリアロケータ |
+|----------------|----|----------------|
+| x86_64 | Linux | mimalloc-rs |
+| aarch64 | Linux | mimalloc-rs |
+| aarch64 | Windows | |
+| x86_64 | Windows | |
+| x86_64, aarch64 | Mac | mimalloc-rs |
+
 ### v0.6.22
 | プラットフォーム | OS | メモリアロケータ |
 |----------------|----|----------------|
@@ -158,15 +167,6 @@ RUSTFLAGS="" cargo build --release -F use-snmalloc
 | x86_64 | Windows | |
 | x86_64, aarch64 | Mac | jemalloc |
 
-### v0.6.19
-| プラットフォーム | OS | メモリアロケータ |
-|----------------|----|----------------|
-| x86_64 | Linux | mimalloc-rs |
-| aarch64 | Linux | mimalloc-rs |
-| aarch64 | Windows | |
-| x86_64 | Windows | |
-| x86_64, aarch64 | Mac | mimalloc-rs |
-
 ### ライブラリインストール
 use-tcmalloc featuresを有効にした場合。
 #### tcmalloc

dist-workspace.toml

@@ -16,7 +16,7 @@ members = ["cargo:."]
 [dist]
 # The preferred dist version to use in CI (Cargo.toml SemVer syntax)
 cargo-dist-version = "0.30.3"
-features = ["use-jemalloc"]
+features = ["use-mimalloc-rs"]
 # CI backends to support
 ci = "github"
 allow-dirty = ["ci"]

src/bin/dict-to-mozc.rs

@@ -1,3 +1,4 @@
+/*
 #[cfg(all(
     feature = "use-mimalloc",
     any(
@@ -6,24 +7,26 @@
         all(target_arch = "aarch64", not(target_os = "windows"))
     )
 ))]
+*/
+#[cfg(feature = "use-mimalloc")]
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 #[cfg(feature = "use-mimalloc-rs")]
 #[global_allocator]
 static GLOBAL_MIMALLOC: mimalloc_rust::GlobalMiMalloc = mimalloc_rust::GlobalMiMalloc;
 
-#[cfg(all(
-    feature = "use-snmalloc",
-    any(
-        not(any(target_arch = "arm", target_arch = "aarch64")),
+//    any(
+//      not(any(target_arch = "arm", target_arch = "aarch64")),
 //    not(target_os = "windows")
-        all(target_arch = "aarch64", not(target_os = "windows"))
-    )
-))]
+//        all(target_arch = "aarch64", not(target_os = "windows"))
+//    )
+//))]
+#[cfg(feature = "use-snmalloc")]
 #[global_allocator]
 static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
 
+/*
 #[cfg(all(
     feature = "use-tcmalloc",
     any(
@@ -32,6 +35,9 @@ static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
 //    not(target_os = "windows")
     )
 ))]
+*/
+
+#[cfg(feature = "use-tcmalloc")]
 #[global_allocator]
 static GLOBAL: tcmalloc::TCMalloc = tcmalloc::TCMalloc;