From d1e1adcb2b03db3bdc45ca33bd339ea9c940a634 Mon Sep 17 00:00:00 2001 From: Xnuk Shuman Date: Mon, 25 Mar 2024 02:22:21 +0900 Subject: [PATCH 1/2] bump up daemonize to 0.5.0 --- Cargo.lock | 11 ++--------- src/tools/kime/Cargo.toml | 3 +-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f62c488..91fa60cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -244,12 +244,6 @@ dependencies = [ "objc2-encode", ] -[[package]] -name = "boxfnonce" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" - [[package]] name = "bumpalo" version = "3.11.1" @@ -742,11 +736,10 @@ checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" [[package]] name = "daemonize" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c24513e34f53b640819f0ac9f705b673fcf4006d7aab8778bee72ebfc89815" +checksum = "ab8bfdaacb3c887a54d41bdf48d3af8873b3f5566469f8ba21b92057509f116e" dependencies = [ - "boxfnonce", "libc", ] diff --git a/src/tools/kime/Cargo.toml b/src/tools/kime/Cargo.toml index f98f8b29..2d2cc392 100644 --- a/src/tools/kime/Cargo.toml +++ b/src/tools/kime/Cargo.toml @@ -11,7 +11,6 @@ kime-version = { path = "../version" } kime-run-dir = { path = "../run_dir" } ctrlc = { version = "3.1.8", features = ["termination"] } -daemonize = "0.4.1" +daemonize = "0.5.0" log = "0.4.14" pico-args = "0.5.0" - From 813f64c78a9b1b7f4019eb33d28df2aa23b4030a Mon Sep 17 00:00:00 2001 From: Xnuk Shuman Date: Mon, 25 Mar 2024 02:26:22 +0900 Subject: [PATCH 2/2] bump rust edition to 2021 --- src/engine/backend/Cargo.toml | 2 +- src/engine/backends/emoji/Cargo.toml | 2 +- src/engine/backends/hangul/Cargo.toml | 2 +- src/engine/backends/hanja/Cargo.toml | 2 +- src/engine/backends/latin/Cargo.toml | 2 +- src/engine/backends/math/Cargo.toml | 2 +- src/engine/candidate/Cargo.toml | 2 +- src/engine/capi/Cargo.toml | 2 +- src/engine/cffi/Cargo.toml | 2 +- src/engine/config/Cargo.toml | 3 +-- src/engine/core/Cargo.toml | 2 +- src/engine/dict/Cargo.toml | 2 +- src/frontends/wayland/Cargo.toml | 2 +- src/frontends/xim/Cargo.toml | 2 +- src/tools/candidate-window/Cargo.toml | 2 +- src/tools/check/Cargo.toml | 2 +- src/tools/indicator/Cargo.toml | 2 +- src/tools/kime/Cargo.toml | 2 +- src/tools/log/Cargo.toml | 2 +- src/tools/properties_writer/Cargo.toml | 2 +- src/tools/run_dir/Cargo.toml | 2 +- src/tools/version/Cargo.toml | 3 +-- 22 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/engine/backend/Cargo.toml b/src/engine/backend/Cargo.toml index d2d5deb1..c14f4e4e 100644 --- a/src/engine/backend/Cargo.toml +++ b/src/engine/backend/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-engine-backend" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/engine/backends/emoji/Cargo.toml b/src/engine/backends/emoji/Cargo.toml index 70b48dc8..a3cc44e8 100644 --- a/src/engine/backends/emoji/Cargo.toml +++ b/src/engine/backends/emoji/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-engine-backend-emoji" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/engine/backends/hangul/Cargo.toml b/src/engine/backends/hangul/Cargo.toml index 91a0fb0c..9abe8a11 100644 --- a/src/engine/backends/hangul/Cargo.toml +++ b/src/engine/backends/hangul/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-engine-backend-hangul" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/engine/backends/hanja/Cargo.toml b/src/engine/backends/hanja/Cargo.toml index 0e014942..1dcdbfa3 100644 --- a/src/engine/backends/hanja/Cargo.toml +++ b/src/engine/backends/hanja/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-engine-backend-hanja" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/engine/backends/latin/Cargo.toml b/src/engine/backends/latin/Cargo.toml index 57601595..e1e25039 100644 --- a/src/engine/backends/latin/Cargo.toml +++ b/src/engine/backends/latin/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-engine-backend-latin" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/engine/backends/math/Cargo.toml b/src/engine/backends/math/Cargo.toml index 079b1715..0506ba36 100644 --- a/src/engine/backends/math/Cargo.toml +++ b/src/engine/backends/math/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-engine-backend-math" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/engine/candidate/Cargo.toml b/src/engine/candidate/Cargo.toml index 213ea411..560f5424 100644 --- a/src/engine/candidate/Cargo.toml +++ b/src/engine/candidate/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-engine-candidate" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dev-dependencies] diff --git a/src/engine/capi/Cargo.toml b/src/engine/capi/Cargo.toml index bf7c2792..9f625bec 100644 --- a/src/engine/capi/Cargo.toml +++ b/src/engine/capi/Cargo.toml @@ -3,7 +3,7 @@ name = "kime-engine-capi" description = "Kime engine library" version = "0.5.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [lib] diff --git a/src/engine/cffi/Cargo.toml b/src/engine/cffi/Cargo.toml index 23a1dc55..c74ad228 100644 --- a/src/engine/cffi/Cargo.toml +++ b/src/engine/cffi/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-engine-cffi" version = "0.8.1" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/engine/config/Cargo.toml b/src/engine/config/Cargo.toml index 0c225882..67146cb3 100644 --- a/src/engine/config/Cargo.toml +++ b/src/engine/config/Cargo.toml @@ -3,7 +3,7 @@ name = "kime-engine-config" version = "0.1.0" authors = ["Riey "] license = "GPL-3.0-or-later" -edition = "2018" +edition = "2021" [features] config-serde = ["serde", "enumset/serde", "log/serde"] @@ -17,4 +17,3 @@ serde = { version = "1.0.124", features = ["derive"], optional = true } enumset = "1.0.6" enum-map = "2" maplit = "1.0.2" - diff --git a/src/engine/core/Cargo.toml b/src/engine/core/Cargo.toml index 7b69996a..06bd2fc0 100644 --- a/src/engine/core/Cargo.toml +++ b/src/engine/core/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-engine-core" version = "2.0.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/engine/dict/Cargo.toml b/src/engine/dict/Cargo.toml index ba7b296b..3b8c9e8b 100644 --- a/src/engine/dict/Cargo.toml +++ b/src/engine/dict/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-engine-dict" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [build-dependencies] diff --git a/src/frontends/wayland/Cargo.toml b/src/frontends/wayland/Cargo.toml index 3b65cd5b..0e4ba6ba 100644 --- a/src/frontends/wayland/Cargo.toml +++ b/src/frontends/wayland/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-wayland" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/frontends/xim/Cargo.toml b/src/frontends/xim/Cargo.toml index f6cd192d..a16bc98c 100644 --- a/src/frontends/xim/Cargo.toml +++ b/src/frontends/xim/Cargo.toml @@ -3,7 +3,7 @@ name = "kime-xim" description = "Kime XIM server" version = "0.3.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/tools/candidate-window/Cargo.toml b/src/tools/candidate-window/Cargo.toml index 4c682e2f..837512cf 100644 --- a/src/tools/candidate-window/Cargo.toml +++ b/src/tools/candidate-window/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-candidate-window" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/tools/check/Cargo.toml b/src/tools/check/Cargo.toml index 3d24b037..06e29646 100644 --- a/src/tools/check/Cargo.toml +++ b/src/tools/check/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-check" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/tools/indicator/Cargo.toml b/src/tools/indicator/Cargo.toml index 6b8ae05a..3aba21fe 100644 --- a/src/tools/indicator/Cargo.toml +++ b/src/tools/indicator/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-indicator" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/tools/kime/Cargo.toml b/src/tools/kime/Cargo.toml index 2d2cc392..692b82eb 100644 --- a/src/tools/kime/Cargo.toml +++ b/src/tools/kime/Cargo.toml @@ -2,7 +2,7 @@ name = "kime" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/tools/log/Cargo.toml b/src/tools/log/Cargo.toml index 3c7d724b..24ad3e9a 100644 --- a/src/tools/log/Cargo.toml +++ b/src/tools/log/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-log" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/tools/properties_writer/Cargo.toml b/src/tools/properties_writer/Cargo.toml index aa0cb6d8..a8504d18 100644 --- a/src/tools/properties_writer/Cargo.toml +++ b/src/tools/properties_writer/Cargo.toml @@ -2,7 +2,7 @@ name = "properties_writer" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/tools/run_dir/Cargo.toml b/src/tools/run_dir/Cargo.toml index 6fa7462d..a5d0d03d 100644 --- a/src/tools/run_dir/Cargo.toml +++ b/src/tools/run_dir/Cargo.toml @@ -2,7 +2,7 @@ name = "kime-run-dir" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] diff --git a/src/tools/version/Cargo.toml b/src/tools/version/Cargo.toml index ffc1838a..9e9d4259 100644 --- a/src/tools/version/Cargo.toml +++ b/src/tools/version/Cargo.toml @@ -2,10 +2,9 @@ name = "kime-version" version = "0.1.0" authors = ["Riey "] -edition = "2018" +edition = "2021" license = "GPL-3.0-or-later" [dependencies] kime-engine-cffi = { path = "../../engine/cffi" } kime-log = { path = "../../tools/log" } -