From 19ca4882c04bf5fa2cdca6b2dab4c86cfc072d6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 00:58:26 +0000 Subject: [PATCH 01/32] build(deps): bump serde_with from 3.7.0 to 3.8.0 (#398) --- Cargo.lock | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0879f974..a793bae9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -494,6 +494,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "beef" version = "0.5.2" @@ -3433,11 +3439,11 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +checksum = "2c85f8e96d1d6857f13768fcbd895fcb06225510022a2774ed8b5150581847b0" dependencies = [ - "base64", + "base64 0.22.0", "chrono", "hex", "indexmap 1.9.3", @@ -3451,9 +3457,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "c8b3a576c4eb2924262d5951a3b737ccaf16c931e39a2810c36f9a7e25575557" dependencies = [ "darling 0.20.8", "proc-macro2", @@ -3998,7 +4004,7 @@ dependencies = [ "async-stream", "async-trait", "axum 0.6.20", - "base64", + "base64 0.21.7", "bytes", "flate2", "h2", From 33799c65919379686d4e97072786ed9740e38505 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 27 Apr 2024 00:29:34 +0000 Subject: [PATCH 02/32] build(deps): bump parking_lot from 0.12.1 to 0.12.2 (#399) --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a793bae9..3bc9c824 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2834,9 +2834,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", From 326594f1034111114e2b65d662836161f24f5908 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 01:22:43 +0000 Subject: [PATCH 03/32] build(deps): bump libc from 0.2.153 to 0.2.154 (#404) --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3bc9c824..4feb04da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2325,9 +2325,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libfuzzer-sys" From 0b82b45229bd4cdb47dfa92ddee494c85dc3eb31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 01:23:04 +0000 Subject: [PATCH 04/32] build(deps): bump serde from 1.0.198 to 1.0.199 (#403) --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4feb04da..115c69e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3366,18 +3366,18 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.198" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.198" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", From b8c47d5aaf2571aceb3a49d3591be6dadbb7926d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 01:23:24 +0000 Subject: [PATCH 05/32] build(deps): bump arboard from 3.3.2 to 3.4.0 (#402) --- Cargo.lock | 97 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 73 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 115c69e5..c3a226e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,19 +115,18 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arboard" -version = "3.3.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "core-graphics", - "image 0.24.9", + "image", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", - "thiserror", "windows-sys 0.48.0", "wl-clipboard-rs", "x11rb", @@ -554,6 +553,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43ff7d91d3c1d568065b06c899777d1e48dcf76103a672a0adbc238a7f247f1e" +dependencies = [ + "objc2", +] + [[package]] name = "blocking" version = "1.5.1" @@ -723,9 +731,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clipboard-win" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" dependencies = [ "error-code", ] @@ -738,7 +746,7 @@ dependencies = [ "directories", "http 1.1.0", "humansize", - "image 0.25.1", + "image", "lazy_static", "mime", "regex", @@ -2140,20 +2148,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", - "png", - "tiff", -] - [[package]] name = "image" version = "0.25.1" @@ -2754,6 +2748,61 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" + +[[package]] +name = "objc2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb79768a710a9a1798848179edb186d1af7e8a8679f369e4b8d201dd2a034047" +dependencies = [ + "block2", + "objc2", + "objc2-core-data", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e092bc42eaf30a08844e6a076938c60751225ec81431ab89f5d1ccd9f958d6c" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-encode" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88658da63e4cc2c8adb1262902cd6af51094df0488b760d6fd27194269c0950a" + +[[package]] +name = "objc2-foundation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfaefe14254871ea16c7d88968c0ff14ba554712a20d76421eec52f0a7fb8904" +dependencies = [ + "block2", + "objc2", +] + [[package]] name = "objc_id" version = "0.1.1" From a476a898c78f3452f82cc40e72d48bd32c16cbce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 01:26:06 +0000 Subject: [PATCH 06/32] build(deps): bump serde_with from 3.8.0 to 3.8.1 (#401) --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3a226e9..8eb01f5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3488,9 +3488,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c85f8e96d1d6857f13768fcbd895fcb06225510022a2774ed8b5150581847b0" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ "base64 0.22.0", "chrono", @@ -3506,9 +3506,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b3a576c4eb2924262d5951a3b737ccaf16c931e39a2810c36f9a7e25575557" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ "darling 0.20.8", "proc-macro2", From b7c821b0796506d3ebd96283840eb32e7e92028f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 01:41:29 +0000 Subject: [PATCH 07/32] build(deps): bump zbus from 4.1.2 to 4.2.0 (#405) --- Cargo.lock | 60 ++++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8eb01f5f..f3501252 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -176,11 +176,10 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand", @@ -190,9 +189,9 @@ dependencies = [ [[package]] name = "async-fs" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ "async-lock 3.3.0", "blocking", @@ -240,9 +239,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" +checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" dependencies = [ "async-channel", "async-io", @@ -260,9 +259,9 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", @@ -311,9 +310,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" @@ -564,18 +563,16 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ "async-channel", "async-lock 3.3.0", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] @@ -1267,17 +1264,6 @@ dependencies = [ "serde", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive-new" version = "0.6.0" @@ -4831,9 +4817,9 @@ dependencies = [ [[package]] name = "zbus" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" +checksum = "6aea58d1af0aaa8abf87f3d9ade9b8f46bf13727e5f9fb24bc31ee9d94a9b4ad" dependencies = [ "async-broadcast", "async-executor", @@ -4845,7 +4831,6 @@ dependencies = [ "async-task", "async-trait", "blocking", - "derivative", "enumflags2", "event-listener 5.3.0", "futures-core", @@ -4871,14 +4856,13 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" +checksum = "1bf2b496ec1e2d3c4a7878e351607f7a2bec1e1029b353683dfc28a22999e369" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "regex", "syn 1.0.109", "zvariant_utils", ] @@ -4920,9 +4904,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +checksum = "4e9282c6945d9e27742ba7ad7191325546636295de7b83f6735af73159b32ac7" dependencies = [ "endi", "enumflags2", @@ -4933,9 +4917,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" +checksum = "0142549e559746ff09d194dd43d256a554299d286cc56460a082b8ae24652aa1" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4946,9 +4930,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +checksum = "75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a" dependencies = [ "proc-macro2", "quote", From d1fc8a07a074d20cd5c7c95f5a49e476e775c070 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 01:00:08 +0000 Subject: [PATCH 08/32] build(deps): bump serde from 1.0.199 to 1.0.200 (#406) --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f3501252..e79a8314 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3401,18 +3401,18 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.199" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", From d4d9ce3fe03e3eb429928bb829a4778475e81594 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 01:00:33 +0000 Subject: [PATCH 09/32] build(deps): bump x11rb from 0.13.0 to 0.13.1 (#407) --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e79a8314..ee984214 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4790,9 +4790,9 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "gethostname", "rustix", @@ -4801,9 +4801,9 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xdg-home" From aacc8603710664e66b2da73203afe648f90e060d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 02:12:21 +0000 Subject: [PATCH 10/32] build(deps): bump prometheus from 0.13.3 to 0.13.4 (#409) --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee984214..94171ee4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3050,9 +3050,9 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if", "fnv", From 9cbcf7e89958f2c980fc99de6a5f41806cead0ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 02:49:52 +0000 Subject: [PATCH 11/32] build(deps): bump semver from 1.0.22 to 1.0.23 (#410) --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 94171ee4..fb1ae27c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3395,9 +3395,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" From b7070629891ad0e7c3bb5353562bf6ba220b9555 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 00:26:32 +0000 Subject: [PATCH 12/32] build(deps): bump serde_json from 1.0.116 to 1.0.117 (#412) --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fb1ae27c..5bb9820c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3421,9 +3421,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", From 6d1e3e3a024e0cda2c53852ee171bf089da53b0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 00:26:49 +0000 Subject: [PATCH 13/32] build(deps): bump serde from 1.0.200 to 1.0.201 (#411) --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5bb9820c..71d35a39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3401,18 +3401,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", From 1c3098c59f347651293c574ecd26e7a423f3e83b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 02:35:37 +0000 Subject: [PATCH 14/32] build(deps): bump zvariant from 4.0.3 to 4.1.0 (#416) --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 71d35a39..2a8c3d7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3022,9 +3022,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -4904,9 +4904,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.0.3" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9282c6945d9e27742ba7ad7191325546636295de7b83f6735af73159b32ac7" +checksum = "877ef94e5e82b231d2a309c531f191a8152baba8241a7939ee04bd76b0171308" dependencies = [ "endi", "enumflags2", @@ -4917,9 +4917,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.3" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0142549e559746ff09d194dd43d256a554299d286cc56460a082b8ae24652aa1" +checksum = "b7ca98581cc6a8120789d8f1f0997e9053837d6aa5346cbb43454d7121be6e39" dependencies = [ "proc-macro-crate", "proc-macro2", From be53d364333fc0df3e42bf903f7a870e1c354692 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 02:35:45 +0000 Subject: [PATCH 15/32] build(deps): bump zbus from 4.2.0 to 4.2.1 (#415) --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a8c3d7b..dbb9791d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4817,9 +4817,9 @@ dependencies = [ [[package]] name = "zbus" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aea58d1af0aaa8abf87f3d9ade9b8f46bf13727e5f9fb24bc31ee9d94a9b4ad" +checksum = "e5915716dff34abef1351d2b10305b019c8ef33dcf6c72d31a6e227d5d9d7a21" dependencies = [ "async-broadcast", "async-executor", @@ -4856,9 +4856,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2b496ec1e2d3c4a7878e351607f7a2bec1e1029b353683dfc28a22999e369" +checksum = "66fceb36d0c1c4a6b98f3ce40f410e64e5a134707ed71892e1b178abc4c695d4" dependencies = [ "proc-macro-crate", "proc-macro2", From 6598a8a3713a24962c435386e2d4c631f4c72773 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 02:37:43 +0000 Subject: [PATCH 16/32] build(deps): bump DeterminateSystems/magic-nix-cache-action from 4 to 5 (#414) --- .github/workflows/rust.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index d9bacf7f..ecf2e8ae 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -41,7 +41,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v10 - - uses: DeterminateSystems/magic-nix-cache-action@v4 + - uses: DeterminateSystems/magic-nix-cache-action@v5 - name: Show rustfmt version run: | @@ -62,7 +62,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v10 - - uses: DeterminateSystems/magic-nix-cache-action@v4 + - uses: DeterminateSystems/magic-nix-cache-action@v5 - name: Pre Cache run: | @@ -108,7 +108,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v10 - - uses: DeterminateSystems/magic-nix-cache-action@v4 + - uses: DeterminateSystems/magic-nix-cache-action@v5 - name: Pre Cache run: | @@ -151,7 +151,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v10 - - uses: DeterminateSystems/magic-nix-cache-action@v4 + - uses: DeterminateSystems/magic-nix-cache-action@v5 - name: Pre Cache run: | From 9022babbe8f579a6cfc156f7306341f8607abdab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 02:37:54 +0000 Subject: [PATCH 17/32] build(deps): bump DeterminateSystems/nix-installer-action from 10 to 11 (#413) --- .github/workflows/lints.yaml | 2 +- .github/workflows/nix.yaml | 2 +- .github/workflows/rust.yaml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lints.yaml b/.github/workflows/lints.yaml index c812a177..a9f60df5 100644 --- a/.github/workflows/lints.yaml +++ b/.github/workflows/lints.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v10 + uses: DeterminateSystems/nix-installer-action@v11 - name: Install treefmt run: nix profile install 'nixpkgs#treefmt' diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml index 7ee5fc58..76f5c0c0 100644 --- a/.github/workflows/nix.yaml +++ b/.github/workflows/nix.yaml @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v10 + uses: DeterminateSystems/nix-installer-action@v11 - name: Build Nix Flake run: nix build diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index ecf2e8ae..ae9af5ab 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v10 + uses: DeterminateSystems/nix-installer-action@v11 - uses: DeterminateSystems/magic-nix-cache-action@v5 @@ -60,7 +60,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v10 + uses: DeterminateSystems/nix-installer-action@v11 - uses: DeterminateSystems/magic-nix-cache-action@v5 @@ -106,7 +106,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v10 + uses: DeterminateSystems/nix-installer-action@v11 - uses: DeterminateSystems/magic-nix-cache-action@v5 @@ -149,7 +149,7 @@ jobs: submodules: "true" - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v10 + uses: DeterminateSystems/nix-installer-action@v11 - uses: DeterminateSystems/magic-nix-cache-action@v5 From 826a80f8fa8290cdf96640c40159abbae878504f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 21:34:40 +0000 Subject: [PATCH 18/32] build(deps): bump DeterminateSystems/magic-nix-cache-action from 5 to 6 (#417) --- .github/workflows/rust.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index ae9af5ab..356d0456 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -41,7 +41,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v11 - - uses: DeterminateSystems/magic-nix-cache-action@v5 + - uses: DeterminateSystems/magic-nix-cache-action@v6 - name: Show rustfmt version run: | @@ -62,7 +62,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v11 - - uses: DeterminateSystems/magic-nix-cache-action@v5 + - uses: DeterminateSystems/magic-nix-cache-action@v6 - name: Pre Cache run: | @@ -108,7 +108,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v11 - - uses: DeterminateSystems/magic-nix-cache-action@v5 + - uses: DeterminateSystems/magic-nix-cache-action@v6 - name: Pre Cache run: | @@ -151,7 +151,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v11 - - uses: DeterminateSystems/magic-nix-cache-action@v5 + - uses: DeterminateSystems/magic-nix-cache-action@v6 - name: Pre Cache run: | From 5873942a29b787a5d8f81a0ded3933681c9d905a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 00:54:05 +0000 Subject: [PATCH 19/32] build(deps): bump serde from 1.0.201 to 1.0.202 (#418) --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dbb9791d..95ad97bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3401,18 +3401,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.201" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", From 54744b1b5770ddfac939f53cb59e5a5181f147b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 00:54:11 +0000 Subject: [PATCH 20/32] build(deps): bump toml from 0.8.12 to 0.8.13 (#419) --- Cargo.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 95ad97bc..7f617cbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3453,9 +3453,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -3987,21 +3987,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -4019,9 +4019,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap 2.2.6", "serde", From b4c29b00811d3d70033b25b9dc22bdd44aabd3ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 May 2024 03:36:41 +0000 Subject: [PATCH 21/32] build(deps): bump prost from 0.12.4 to 0.12.6 (#420) --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7f617cbb..e9973d47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3065,9 +3065,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", "prost-derive", @@ -3096,9 +3096,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools", From f5ce9a9db279b148dba28a3ecbb8aa6b6f0f702a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 May 2024 03:36:48 +0000 Subject: [PATCH 22/32] build(deps): bump prost-build from 0.12.4 to 0.12.6 (#421) --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9973d47..1e921435 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3075,9 +3075,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", "heck 0.5.0", @@ -3109,9 +3109,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ "prost", ] From 17a1d540ebf13cf91dc8098f96f918d52cfd23a2 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 19 May 2024 13:53:16 +0800 Subject: [PATCH 23/32] feat: replace `lazy_static` with `once_cell` (#423) --- Cargo.lock | 6 +++--- crates/base/Cargo.toml | 2 +- crates/base/src/lib.rs | 33 +++++++++++++++---------------- crates/metrics/Cargo.toml | 10 +++++----- crates/metrics/src/server.rs | 23 ++++++++++----------- crates/server/Cargo.toml | 2 +- crates/server/src/grpc/system.rs | 16 +++++++-------- crates/server/src/metrics/dbus.rs | 19 +++++++++--------- crates/server/src/metrics/grpc.rs | 11 +++++------ 9 files changed, 60 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1e921435..2ff33e5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -744,8 +744,8 @@ dependencies = [ "http 1.1.0", "humansize", "image", - "lazy_static", "mime", + "once_cell", "regex", "semver", "serde", @@ -857,8 +857,8 @@ dependencies = [ "async-trait", "axum 0.7.5", "bytes", - "lazy_static", "mime", + "once_cell", "prometheus", "snafu 0.8.2", "tokio", @@ -911,10 +911,10 @@ dependencies = [ "futures", "hex", "humansize", - "lazy_static", "mime", "notify", "notify-rust", + "once_cell", "parking_lot", "prometheus", "regex", diff --git a/crates/base/Cargo.toml b/crates/base/Cargo.toml index ce297982..58e34fdd 100644 --- a/crates/base/Cargo.toml +++ b/crates/base/Cargo.toml @@ -23,8 +23,8 @@ bytes = "1" directories = "5" humansize = "2" image = "0.25" -lazy_static = "1" mime = "0.3" +once_cell = "1" regex = "1" semver = "1" sha2 = "0.10" diff --git a/crates/base/src/lib.rs b/crates/base/src/lib.rs index b8dac711..21f4749b 100644 --- a/crates/base/src/lib.rs +++ b/crates/base/src/lib.rs @@ -15,7 +15,7 @@ use std::{ use bytes::Bytes; use directories::ProjectDirs; -use lazy_static::lazy_static; +use once_cell::sync::Lazy; pub use self::{ entry::{Entry as ClipEntry, Error as ClipEntryError, Metadata as ClipEntryMetadata}, @@ -32,16 +32,15 @@ pub const DBUS_SYSTEM_OBJECT_PATH: &str = "/org/clipcat/clipcat/system"; pub const DBUS_WATCHER_OBJECT_PATH: &str = "/org/clipcat/clipcat/watcher"; pub const DBUS_MANAGER_OBJECT_PATH: &str = "/org/clipcat/clipcat/manager"; -lazy_static! { - pub static ref PROJECT_SEMVER: semver::Version = semver::Version::parse(PROJECT_VERSION) - .unwrap_or(semver::Version { - major: 0, - minor: 0, - patch: 0, - pre: semver::Prerelease::EMPTY, - build: semver::BuildMetadata::EMPTY - }); -} +pub static PROJECT_SEMVER: Lazy = Lazy::new(|| { + semver::Version::parse(PROJECT_VERSION).unwrap_or(semver::Version { + major: 0, + minor: 0, + patch: 0, + pre: semver::Prerelease::EMPTY, + build: semver::BuildMetadata::EMPTY, + }) +}); pub const PROJECT_NAME: &str = "clipcat"; pub const PROJECT_NAME_WITH_INITIAL_CAPITAL: &str = "Clipcat"; @@ -70,12 +69,12 @@ pub const DEFAULT_METRICS_HOST: IpAddr = IpAddr::V4(Ipv4Addr::LOCALHOST); pub const DEFAULT_MENU_PROMPT: &str = "Clipcat"; -lazy_static::lazy_static! { -pub static ref PROJECT_CONFIG_DIR: PathBuf = ProjectDirs::from("", PROJECT_NAME, PROJECT_NAME) - .expect("Creating `ProjectDirs` should always success") - .config_dir() - .to_path_buf(); -} +pub static PROJECT_CONFIG_DIR: Lazy = Lazy::new(|| { + ProjectDirs::from("", PROJECT_NAME, PROJECT_NAME) + .expect("Creating `ProjectDirs` should always success") + .config_dir() + .to_path_buf() +}); #[must_use] pub fn fallback_project_config_directories() -> Vec { diff --git a/crates/metrics/Cargo.toml b/crates/metrics/Cargo.toml index 98ca906e..142f4492 100644 --- a/crates/metrics/Cargo.toml +++ b/crates/metrics/Cargo.toml @@ -20,11 +20,11 @@ axum = "0.7" tower = { version = "0.4", features = ["timeout"] } tower-http = { version = "0.5", features = ["trace"] } -bytes = "1" -lazy_static = "1" -mime = "0.3" -prometheus = "0.13" -snafu = "0.8" +bytes = "1" +mime = "0.3" +once_cell = "1" +prometheus = "0.13" +snafu = "0.8" [lints] workspace = true diff --git a/crates/metrics/src/server.rs b/crates/metrics/src/server.rs index 5e58eab6..9ebd35a7 100644 --- a/crates/metrics/src/server.rs +++ b/crates/metrics/src/server.rs @@ -8,8 +8,8 @@ use axum::{ routing, Router, }; use bytes::{BufMut, BytesMut}; -use lazy_static::lazy_static; use mime::Mime; +use once_cell::sync::Lazy; use prometheus::{Encoder, TextEncoder}; use snafu::ResultExt; use tokio::net::TcpListener; @@ -19,12 +19,13 @@ use crate::{ traits, }; -lazy_static! { - static ref OPENMETRICS_TEXT: Mime = - Mime::from_str("application/openmetrics-text; version=1.0.0; charset=utf-8") - .expect("is valid mime type; qed"); - static ref ENCODER: TextEncoder = TextEncoder::new(); -} +// FIXME: use `OPENMETRICS_TEXT` +#[allow(dead_code)] +static OPENMETRICS_TEXT: Lazy = Lazy::new(|| { + Mime::from_str("application/openmetrics-text; version=1.0.0; charset=utf-8") + .expect("is valid mime type; qed") +}); +static ENCODER: Lazy = Lazy::new(TextEncoder::new); async fn metrics(Extension(metrics): Extension) -> Response where @@ -79,14 +80,14 @@ where #[cfg(test)] mod tests { - use lazy_static::initialize; + use once_cell::sync::Lazy; use crate::server::{ENCODER, OPENMETRICS_TEXT}; #[test] - fn test_lazy_static() { - initialize(&OPENMETRICS_TEXT); - initialize(&ENCODER); + fn test_once_cell_lazy() { + let _ = Lazy::force(&OPENMETRICS_TEXT); + let _ = Lazy::force(&ENCODER); } #[test] diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml index bde5f499..2b39ebb7 100644 --- a/crates/server/Cargo.toml +++ b/crates/server/Cargo.toml @@ -37,10 +37,10 @@ zvariant = "4" hex = "0.4" humansize = "2" -lazy_static = "1" mime = "0.3" notify = "6" notify-rust = "4" +once_cell = "1" parking_lot = "0.12" prometheus = "0.13" regex = "1" diff --git a/crates/server/src/grpc/system.rs b/crates/server/src/grpc/system.rs index 43b54c78..3b89fa5a 100644 --- a/crates/server/src/grpc/system.rs +++ b/crates/server/src/grpc/system.rs @@ -1,15 +1,13 @@ use clipcat_proto as proto; -use lazy_static::lazy_static; +use once_cell::sync::Lazy; use tonic::{Request, Response, Status}; -lazy_static! { - static ref GET_SYSTEM_VERSION_RESPONSE: proto::GetSystemVersionResponse = - proto::GetSystemVersionResponse { - major: clipcat_base::PROJECT_SEMVER.major, - minor: clipcat_base::PROJECT_SEMVER.minor, - patch: clipcat_base::PROJECT_SEMVER.patch - }; -} +static GET_SYSTEM_VERSION_RESPONSE: Lazy = + Lazy::new(|| proto::GetSystemVersionResponse { + major: clipcat_base::PROJECT_SEMVER.major, + minor: clipcat_base::PROJECT_SEMVER.minor, + patch: clipcat_base::PROJECT_SEMVER.patch, + }); pub struct SystemService {} diff --git a/crates/server/src/metrics/dbus.rs b/crates/server/src/metrics/dbus.rs index d85ed4d3..fb9392bd 100644 --- a/crates/server/src/metrics/dbus.rs +++ b/crates/server/src/metrics/dbus.rs @@ -1,13 +1,14 @@ -use lazy_static::lazy_static; +use once_cell::sync::Lazy; use prometheus::{Histogram, HistogramOpts, IntCounter}; -lazy_static! { - pub static ref REQUESTS_TOTAL: IntCounter = - IntCounter::new("dbus_requests_total", "Total number of request from D-Bus") - .expect("setup metrics"); - pub static ref REQUEST_DURATION_SECONDS: Histogram = Histogram::with_opts(HistogramOpts::new( +pub static REQUESTS_TOTAL: Lazy = Lazy::new(|| { + IntCounter::new("dbus_requests_total", "Total number of request from D-Bus") + .expect("setup metrics") +}); +pub static REQUEST_DURATION_SECONDS: Lazy = Lazy::new(|| { + Histogram::with_opts(HistogramOpts::new( "dbus_request_duration_seconds", - "Latencies of handling request with D-Bus in seconds" + "Latencies of handling request with D-Bus in seconds", )) - .expect("setup metrics"); -} + .expect("setup metrics") +}); diff --git a/crates/server/src/metrics/grpc.rs b/crates/server/src/metrics/grpc.rs index 1414fc45..ce8c9364 100644 --- a/crates/server/src/metrics/grpc.rs +++ b/crates/server/src/metrics/grpc.rs @@ -1,8 +1,7 @@ -use lazy_static::lazy_static; +use once_cell::sync::Lazy; use prometheus::IntCounter; -lazy_static! { - pub static ref REQUESTS_TOTAL: IntCounter = - IntCounter::new("grpc_requests_total", "Total number of request from gRPC") - .expect("setup metrics"); -} +pub static REQUESTS_TOTAL: Lazy = Lazy::new(|| { + IntCounter::new("grpc_requests_total", "Total number of request from gRPC") + .expect("setup metrics") +}); From 3791bb05e2b0517286c390eef9eab6a108963d45 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 19 May 2024 13:58:25 +0800 Subject: [PATCH 24/32] chore(nix): update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/3dda6d40ca7ae22cad80269709fb223ed6288f08' (2024-04-21) → 'github:ipetkov/crane/a7146b04405d93b24a1bac76d93270787872c8be' (2024-05-19) • Updated input 'fenix': 'github:nix-community/fenix/3247290e1bba55878a2c62d43894d0309d29c918' (2024-04-20) → 'github:nix-community/fenix/a4b7a4acfb44ee78785b0b53667066a9b1e32245' (2024-05-18) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/c83d8cf5844fff3d6e243ab408669222059af1c6' (2024-04-19) → 'github:rust-lang/rust-analyzer/83ba42043166948db91fcfcfe30e0b7eac10b3d5' (2024-05-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5c24cf2f0a12ad855f444c30b2421d044120c66f' (2024-04-19) → 'github:NixOS/nixpkgs/4a6b83b05df1a8bd7d99095ec4b4d271f2956b64' (2024-05-17) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e251997e..beae2fa8 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1713673197, - "narHash": "sha256-akCll53JuKHtJc76NGs92bnPGGRW5eufm6XXVJ+VgAs=", + "lastModified": 1716080827, + "narHash": "sha256-2R9LBCR8TlMuK4Md9ELwPVuwRQWI3pAh7Nj9e318Hk4=", "owner": "ipetkov", "repo": "crane", - "rev": "3dda6d40ca7ae22cad80269709fb223ed6288f08", + "rev": "a7146b04405d93b24a1bac76d93270787872c8be", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1713594079, - "narHash": "sha256-lYWehi0cqBdsL1W4xeUnUcXw4U4aBKKCmmQrR01yqE0=", + "lastModified": 1716054143, + "narHash": "sha256-FJJMYOmzST4gOiOo4g5XicKKALv8SWqqk2kntpIF3NM=", "owner": "nix-community", "repo": "fenix", - "rev": "3247290e1bba55878a2c62d43894d0309d29c918", + "rev": "a4b7a4acfb44ee78785b0b53667066a9b1e32245", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713537308, - "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", + "lastModified": 1715961556, + "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f", + "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1713559870, - "narHash": "sha256-HsVa+QM2vMra80OjnjH7JhdvLeJuMdR4sxBNHJveMe4=", + "lastModified": 1715839492, + "narHash": "sha256-EyjtjocGLtB7tqyqwBfadP4y5BBtT5EkoG3kq/zym5U=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "c83d8cf5844fff3d6e243ab408669222059af1c6", + "rev": "83ba42043166948db91fcfcfe30e0b7eac10b3d5", "type": "github" }, "original": { From d0d996d15990d93811ebe4b334039a93dfc1fa24 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 19 May 2024 14:18:53 +0800 Subject: [PATCH 25/32] fix: fix lints and errors --- Cargo.toml | 5 ----- clipcat-menu/src/finder/external/choose.rs | 4 ---- clipcat-menu/src/finder/external/dmenu.rs | 4 ---- clipcat-menu/src/finder/external/rofi.rs | 4 ---- clipcat-menu/src/finder/finder_stream.rs | 4 ---- clipcatd/src/command.rs | 4 ++-- crates/base/src/kind.rs | 2 +- crates/base/src/lib.rs | 4 ++-- crates/clipboard/src/listener/x11/context.rs | 4 ++-- crates/clipboard/src/listener/x11/mod.rs | 2 +- crates/server/src/history/driver/fs/mod.rs | 4 ++-- crates/server/src/lib.rs | 4 +--- crates/server/src/metrics/mod.rs | 6 +++--- crates/server/src/snippets/event_handler.rs | 9 ++------- crates/server/src/snippets/mod.rs | 2 +- 15 files changed, 17 insertions(+), 45 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2f8736ad..420a17d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,7 +80,6 @@ coherence_leak_check = "deny" confusable_idents = "deny" const_evaluatable_unchecked = "deny" const_item_mutation = "deny" -const_patterns_without_partial_eq = "deny" dead_code = "deny" deprecated = "deny" deprecated_where_clause_location = "deny" @@ -100,7 +99,6 @@ forgetting_references = "deny" for_loops_over_fallibles = "deny" function_item_references = "deny" hidden_glob_reexports = "deny" -illegal_floating_point_literal_pattern = "deny" improper_ctypes = "deny" improper_ctypes_definitions = "deny" incomplete_features = "deny" @@ -119,7 +117,6 @@ legacy_derive_helpers = "deny" map_unit_fn = "deny" mixed_script_confusables = "deny" named_arguments_used_positionally = "deny" -nontrivial_structural_match = "deny" non_camel_case_types = "deny" non_fmt_panics = "deny" non_shorthand_field_patterns = "deny" @@ -134,12 +131,10 @@ private_bounds = "deny" private_interfaces = "deny" redundant_semicolons = "deny" refining_impl_trait = "deny" -renamed_and_removed_lints = "deny" repr_transparent_external_private_fields = "deny" semicolon_in_expressions_from_macros = "deny" special_module_name = "deny" stable_features = "deny" -suspicious_auto_trait_impls = "deny" suspicious_double_ref_op = "deny" temporary_cstring_as_ptr = "deny" trivial_bounds = "deny" diff --git a/clipcat-menu/src/finder/external/choose.rs b/clipcat-menu/src/finder/external/choose.rs index 1f6cca26..e01a86aa 100644 --- a/clipcat-menu/src/finder/external/choose.rs +++ b/clipcat-menu/src/finder/external/choose.rs @@ -56,10 +56,6 @@ impl FinderStream for Choose { .collect() } - fn line_length(&self) -> Option { Some(self.line_length) } - - fn menu_length(&self) -> Option { Some(self.menu_length) } - fn set_line_length(&mut self, line_length: usize) { self.line_length = line_length } fn set_menu_length(&mut self, menu_length: usize) { self.menu_length = menu_length; } diff --git a/clipcat-menu/src/finder/external/dmenu.rs b/clipcat-menu/src/finder/external/dmenu.rs index 73dcba69..b199f70c 100644 --- a/clipcat-menu/src/finder/external/dmenu.rs +++ b/clipcat-menu/src/finder/external/dmenu.rs @@ -30,10 +30,6 @@ impl ExternalProgram for Dmenu { } impl FinderStream for Dmenu { - fn line_length(&self) -> Option { Some(self.line_length) } - - fn menu_length(&self) -> Option { Some(self.menu_length) } - fn set_line_length(&mut self, line_length: usize) { self.line_length = line_length } fn set_menu_length(&mut self, menu_length: usize) { self.menu_length = menu_length; } diff --git a/clipcat-menu/src/finder/external/rofi.rs b/clipcat-menu/src/finder/external/rofi.rs index 497d70fe..2edee7a5 100644 --- a/clipcat-menu/src/finder/external/rofi.rs +++ b/clipcat-menu/src/finder/external/rofi.rs @@ -61,10 +61,6 @@ impl FinderStream for Rofi { .collect() } - fn line_length(&self) -> Option { Some(self.line_length) } - - fn menu_length(&self) -> Option { Some(self.menu_length) } - fn set_line_length(&mut self, line_length: usize) { self.line_length = line_length } fn set_menu_length(&mut self, menu_length: usize) { self.menu_length = menu_length; } diff --git a/clipcat-menu/src/finder/finder_stream.rs b/clipcat-menu/src/finder/finder_stream.rs index ba8d40ae..9e731e23 100644 --- a/clipcat-menu/src/finder/finder_stream.rs +++ b/clipcat-menu/src/finder/finder_stream.rs @@ -32,10 +32,6 @@ pub trait FinderStream: Send + Sync { fn set_line_length(&mut self, _line_length: usize) {} fn set_menu_length(&mut self, _menu_length: usize) {} - - fn menu_length(&self) -> Option { None } - - fn line_length(&self) -> Option { None } } #[cfg(test)] diff --git a/clipcatd/src/command.rs b/clipcatd/src/command.rs index 156c9fb5..e0dbecd1 100644 --- a/clipcatd/src/command.rs +++ b/clipcatd/src/command.rs @@ -113,7 +113,7 @@ impl Cli { config.daemonize = !self.no_daemon; if let Some(history_file_path) = &self.history_file_path { - config.history_file_path = history_file_path.clone(); + config.history_file_path.clone_from(history_file_path); } if let Some(host) = self.grpc_host { @@ -127,7 +127,7 @@ impl Cli { if let Some(path) = &self.grpc_socket_path { config.grpc.enable_local_socket = true; - config.grpc.local_socket = path.clone(); + config.grpc.local_socket.clone_from(path); } if !config.grpc.enable_http && !config.grpc.enable_local_socket { diff --git a/crates/base/src/kind.rs b/crates/base/src/kind.rs index 43653c63..c5ce03bc 100644 --- a/crates/base/src/kind.rs +++ b/crates/base/src/kind.rs @@ -84,7 +84,7 @@ impl From for Kind { } impl fmt::Display for Kind { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result { f.write_str(self.as_str()) } + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.write_str(self.as_str()) } } #[derive(Debug, Snafu)] diff --git a/crates/base/src/lib.rs b/crates/base/src/lib.rs index 21f4749b..90111561 100644 --- a/crates/base/src/lib.rs +++ b/crates/base/src/lib.rs @@ -82,8 +82,8 @@ pub fn fallback_project_config_directories() -> Vec { return Vec::new(); }; vec![ - [user_dirs.home_dir(), &Path::new(".config"), &Path::new(PROJECT_NAME)].iter().collect(), - [user_dirs.home_dir(), &Path::new(&format!(".{PROJECT_NAME}"))].iter().collect(), + [user_dirs.home_dir(), Path::new(".config"), Path::new(PROJECT_NAME)].iter().collect(), + [user_dirs.home_dir(), Path::new(&format!(".{PROJECT_NAME}"))].iter().collect(), ] } diff --git a/crates/clipboard/src/listener/x11/context.rs b/crates/clipboard/src/listener/x11/context.rs index 7da35df9..b08f1e39 100644 --- a/crates/clipboard/src/listener/x11/context.rs +++ b/crates/clipboard/src/listener/x11/context.rs @@ -82,7 +82,7 @@ impl Context { .context(error::ReplySnafu)?; if !xfixes.present { - return Err(error::Error::XfixesNotPresent); + return Err(Error::XfixesNotPresent); } drop(self.connection.set_selection_owner( @@ -133,7 +133,7 @@ impl Context { while Instant::now() < timeout_end { let maybe_event = self.connection.poll_for_event().context(error::PollForEventSnafu)?; let Some(event) = maybe_event else { - thread::sleep(std::time::Duration::from_millis(1)); + thread::sleep(Duration::from_millis(1)); continue; }; diff --git a/crates/clipboard/src/listener/x11/mod.rs b/crates/clipboard/src/listener/x11/mod.rs index dc2110e8..ed23f075 100644 --- a/crates/clipboard/src/listener/x11/mod.rs +++ b/crates/clipboard/src/listener/x11/mod.rs @@ -200,7 +200,7 @@ fn try_reconnect( n = interval.as_millis(), kind = context.clipboard_kind() ); - std::thread::sleep(interval); + thread::sleep(interval); } else { poll.registry() .register( diff --git a/crates/server/src/history/driver/fs/mod.rs b/crates/server/src/history/driver/fs/mod.rs index 0d49f026..738c58e8 100644 --- a/crates/server/src/history/driver/fs/mod.rs +++ b/crates/server/src/history/driver/fs/mod.rs @@ -307,14 +307,14 @@ fn header_file_path

(file_path: P) -> PathBuf where P: AsRef, { - [file_path.as_ref(), &Path::new("header.json")].into_iter().collect() + [file_path.as_ref(), Path::new("header.json")].into_iter().collect() } fn clips_file_path

(file_path: P) -> PathBuf where P: AsRef, { - [file_path.as_ref(), &Path::new("clips")].into_iter().collect() + [file_path.as_ref(), Path::new("clips")].into_iter().collect() } fn image_dir_path

(file_path: P) -> PathBuf diff --git a/crates/server/src/lib.rs b/crates/server/src/lib.rs index a347e663..9f70a201 100644 --- a/crates/server/src/lib.rs +++ b/crates/server/src/lib.rs @@ -533,9 +533,7 @@ async fn serve_worker( if synchronize_selection_with_clipboard && clip.kind() == ClipboardKind::Clipboard { - if let Err(err) = - clipboard_manager.mark(id, clipcat_base::ClipboardKind::Primary).await - { + if let Err(err) = clipboard_manager.mark(id, ClipboardKind::Primary).await { tracing::warn!("{err}"); } } diff --git a/crates/server/src/metrics/mod.rs b/crates/server/src/metrics/mod.rs index cf749253..ca955404 100644 --- a/crates/server/src/metrics/mod.rs +++ b/crates/server/src/metrics/mod.rs @@ -15,15 +15,15 @@ impl Metrics { // gRPC registry - .register(Box::new(self::grpc::REQUESTS_TOTAL.clone())) + .register(Box::new(grpc::REQUESTS_TOTAL.clone())) .context(error::SetupMetricsSnafu)?; // D-Bus registry - .register(Box::new(self::dbus::REQUESTS_TOTAL.clone())) + .register(Box::new(dbus::REQUESTS_TOTAL.clone())) .context(error::SetupMetricsSnafu)?; registry - .register(Box::new(self::dbus::REQUEST_DURATION_SECONDS.clone())) + .register(Box::new(dbus::REQUEST_DURATION_SECONDS.clone())) .context(error::SetupMetricsSnafu)?; Ok(Self { registry }) diff --git a/crates/server/src/snippets/event_handler.rs b/crates/server/src/snippets/event_handler.rs index 33430109..653cee41 100644 --- a/crates/server/src/snippets/event_handler.rs +++ b/crates/server/src/snippets/event_handler.rs @@ -98,11 +98,6 @@ where return None; } - clipcat_base::ClipEntry::new( - &data, - &mime::TEXT_PLAIN_UTF_8, - clipcat_base::ClipboardKind::Clipboard, - None, - ) - .ok() + ClipEntry::new(&data, &mime::TEXT_PLAIN_UTF_8, clipcat_base::ClipboardKind::Clipboard, None) + .ok() } diff --git a/crates/server/src/snippets/mod.rs b/crates/server/src/snippets/mod.rs index c64c5571..753b7177 100644 --- a/crates/server/src/snippets/mod.rs +++ b/crates/server/src/snippets/mod.rs @@ -65,7 +65,7 @@ async fn load(config: &config::SnippetConfig) -> HashMap Date: Sat, 25 May 2024 02:22:58 +0000 Subject: [PATCH 26/32] build(deps): bump snafu from 0.8.2 to 0.8.3 (#430) --- Cargo.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ff33e5f..df8fc9be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -750,7 +750,7 @@ dependencies = [ "semver", "serde", "sha2", - "snafu 0.8.2", + "snafu 0.8.3", "time", "tokio", ] @@ -777,7 +777,7 @@ dependencies = [ "mime", "prost-types", "semver", - "snafu 0.8.2", + "snafu 0.8.3", "tokio", "tonic", "tower", @@ -798,7 +798,7 @@ dependencies = [ "objc_id", "parking_lot", "sigfinn", - "snafu 0.8.2", + "snafu 0.8.3", "tokio", "tracing", "tracing-subscriber", @@ -822,7 +822,7 @@ name = "clipcat-external-editor" version = "0.17.0" dependencies = [ "clipcat-base", - "snafu 0.8.2", + "snafu 0.8.3", "tokio", ] @@ -842,7 +842,7 @@ dependencies = [ "serde", "shadow-rs", "skim", - "snafu 0.8.2", + "snafu 0.8.3", "tokio", "toml", "tracing", @@ -860,7 +860,7 @@ dependencies = [ "mime", "once_cell", "prometheus", - "snafu 0.8.2", + "snafu 0.8.3", "tokio", "tower", "tower-http", @@ -878,7 +878,7 @@ dependencies = [ "serde", "serde_json", "shadow-rs", - "snafu 0.8.2", + "snafu 0.8.3", "time", "tokio", ] @@ -923,7 +923,7 @@ dependencies = [ "serde_json", "sigfinn", "simdutf8", - "snafu 0.8.2", + "snafu 0.8.3", "time", "tokio", "tokio-stream", @@ -952,7 +952,7 @@ dependencies = [ "serde", "shadow-rs", "simdutf8", - "snafu 0.8.2", + "snafu 0.8.3", "tokio", "toml", "tracing", @@ -979,7 +979,7 @@ dependencies = [ "serde", "shadow-rs", "simdutf8", - "snafu 0.8.2", + "snafu 0.8.3", "time", "tokio", "toml", @@ -3652,11 +3652,11 @@ dependencies = [ [[package]] name = "snafu" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" +checksum = "418b8136fec49956eba89be7da2847ec1909df92a9ae4178b5ff0ff092c8d95e" dependencies = [ - "snafu-derive 0.8.2", + "snafu-derive 0.8.3", ] [[package]] @@ -3673,11 +3673,11 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" +checksum = "1a4812a669da00d17d8266a0439eddcacbc88b17f732f927e52eeb9d196f7fb5" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.58", From a509c4ded9fc4d19c1eec89dfea368dde0d6023a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 May 2024 10:47:21 +0800 Subject: [PATCH 27/32] build(deps): bump shadow-rs from 0.27.1 to 0.28.0 (#425) Co-authored-by: xrelkd <46590321+xrelkd@users.noreply.github.com> --- Cargo.lock | 556 +++++++++++++++++++++----------------- clipcat-menu/Cargo.toml | 4 +- clipcat-notify/Cargo.toml | 4 +- clipcatctl/Cargo.toml | 4 +- clipcatd/Cargo.toml | 4 +- 5 files changed, 317 insertions(+), 255 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index df8fc9be..21fcc2da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,47 +55,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -103,9 +104,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arbitrary" @@ -140,7 +141,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -156,20 +157,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] @@ -193,7 +193,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 3.3.0", + "async-lock", "blocking", "futures-lite", ] @@ -204,7 +204,7 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", @@ -217,15 +217,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - [[package]] name = "async-lock" version = "3.3.0" @@ -245,7 +236,7 @@ checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" dependencies = [ "async-channel", "async-io", - "async-lock 3.3.0", + "async-lock", "async-signal", "async-task", "blocking", @@ -265,17 +256,17 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" dependencies = [ "async-io", - "async-lock 2.8.0", + "async-lock", "atomic-waker", "cfg-if", "futures-core", @@ -283,7 +274,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -305,7 +296,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -322,7 +313,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -344,9 +335,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "av1-grain" @@ -412,7 +403,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.3.1", "hyper-util", "itoa", "matchit", @@ -494,9 +485,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "beef" @@ -533,9 +524,9 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitstream-io" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" +checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" [[package]] name = "block" @@ -554,9 +545,9 @@ dependencies = [ [[package]] name = "block2" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ff7d91d3c1d568065b06c899777d1e48dcf76103a672a0adbc238a7f247f1e" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ "objc2", ] @@ -568,7 +559,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ "async-channel", - "async-lock 3.3.0", + "async-lock", "async-task", "futures-io", "futures-lite", @@ -577,9 +568,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" [[package]] name = "bumpalo" @@ -589,9 +580,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -599,6 +590,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" version = "1.6.0" @@ -607,12 +604,13 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.94" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -639,9 +637,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -708,7 +706,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -996,24 +994,24 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] name = "const_fn" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" +checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d" [[package]] name = "const_format" @@ -1086,9 +1084,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -1108,9 +1106,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1145,9 +1143,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1186,12 +1184,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", + "darling_core 0.20.9", + "darling_macro 0.20.9", ] [[package]] @@ -1210,16 +1208,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.58", + "strsim 0.11.1", + "syn 2.0.66", ] [[package]] @@ -1235,13 +1233,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.9", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1272,7 +1270,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1410,9 +1408,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "endi" @@ -1438,7 +1436,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1462,9 +1460,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1476,12 +1474,6 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "event-listener" version = "4.0.3" @@ -1516,9 +1508,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ "event-listener 5.3.0", "pin-project-lite", @@ -1548,9 +1540,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1578,7 +1570,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] @@ -1590,9 +1582,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1631,7 +1623,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1737,7 +1729,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -1801,9 +1793,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1885,9 +1877,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -2050,9 +2042,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -2081,17 +2073,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" dependencies = [ "bytes", "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.2.0", + "hyper 1.3.1", "pin-project-lite", - "socket2", "tokio", ] @@ -2159,11 +2150,11 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" dependencies = [ - "byteorder", + "byteorder-lite", "thiserror", ] @@ -2191,7 +2182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -2223,7 +2214,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -2232,6 +2223,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.12.1" @@ -2249,9 +2246,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2305,9 +2302,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libfuzzer-sys" @@ -2360,9 +2357,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -2395,15 +2392,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2509,9 +2506,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -2639,11 +2636,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -2662,7 +2658,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -2676,11 +2672,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -2688,9 +2683,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2736,15 +2731,15 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b25e1034d0e636cd84707ccdaa9f81243d399196b8a773946dcffec0401659" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", "objc2-encode", @@ -2752,41 +2747,85 @@ dependencies = [ [[package]] name = "objc2-app-kit" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb79768a710a9a1798848179edb186d1af7e8a8679f369e4b8d201dd2a034047" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ + "bitflags 2.5.0", "block2", + "libc", "objc2", "objc2-core-data", + "objc2-core-image", "objc2-foundation", + "objc2-quartz-core", ] [[package]] name = "objc2-core-data" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e092bc42eaf30a08844e6a076938c60751225ec81431ab89f5d1ccd9f958d6c" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ + "bitflags 2.5.0", "block2", "objc2", "objc2-foundation", ] +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + [[package]] name = "objc2-encode" -version = "4.0.1" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88658da63e4cc2c8adb1262902cd6af51094df0488b760d6fd27194269c0950a" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" [[package]] name = "objc2-foundation" -version = "0.2.0" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2", + "libc", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfaefe14254871ea16c7d88968c0ff14ba554712a20d76421eec52f0a7fb8904" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ + "bitflags 2.5.0", "block2", "objc2", + "objc2-foundation", + "objc2-metal", ] [[package]] @@ -2869,9 +2908,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2879,22 +2918,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -2904,9 +2943,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap 2.2.6", @@ -2929,7 +2968,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -2946,9 +2985,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", "fastrand", @@ -2976,9 +3015,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", @@ -3003,12 +3042,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3022,9 +3061,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ "unicode-ident", ] @@ -3045,7 +3084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3090,7 +3129,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.58", + "syn 2.0.66", "tempfile", ] @@ -3104,7 +3143,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3137,15 +3176,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] - [[package]] name = "quick-xml" version = "0.31.0" @@ -3273,6 +3303,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "redox_users" version = "0.4.5" @@ -3343,15 +3382,15 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -3362,15 +3401,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3416,7 +3455,7 @@ checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3448,7 +3487,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3478,7 +3517,7 @@ version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", @@ -3496,10 +3535,10 @@ version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ - "darling 0.20.8", + "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3526,9 +3565,9 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7960cbd6ba74691bb15e7ebf97f7136bd02d1115f5695a58c1f31d5645750128" +checksum = "1d75516bdaee8f640543ad1f6e292448c23ce57143f812c3736ab4b0874383df" dependencies = [ "const_format", "git2", @@ -3566,9 +3605,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3680,14 +3719,14 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3733,9 +3772,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -3775,11 +3814,11 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri-winrt-notification" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d59cba96cdbf291d74490ac477c66885ebdc87e28faca532ec1e00f4f3bd578" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml 0.30.0", + "quick-xml", "windows", "windows-version", ] @@ -3824,22 +3863,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3957,7 +3996,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -3973,16 +4012,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4027,7 +4065,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.6", + "winnow 0.6.8", ] [[package]] @@ -4068,7 +4106,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -4140,7 +4178,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", ] [[package]] @@ -4292,9 +4330,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -4421,7 +4459,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -4443,7 +4481,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4512,7 +4550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" dependencies = [ "proc-macro2", - "quick-xml 0.31.0", + "quick-xml", "quote", ] @@ -4551,11 +4589,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4566,11 +4604,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-core 0.54.0", + "windows-core 0.56.0", "windows-targets 0.52.5", ] @@ -4585,14 +4623,38 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.54.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" dependencies = [ + "windows-implement", + "windows-interface", "windows-result", "windows-targets 0.52.5", ] +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "windows-result" version = "0.1.1" @@ -4761,9 +4823,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] @@ -4817,15 +4879,15 @@ dependencies = [ [[package]] name = "zbus" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5915716dff34abef1351d2b10305b019c8ef33dcf6c72d31a6e227d5d9d7a21" +checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" dependencies = [ "async-broadcast", "async-executor", "async-fs", "async-io", - "async-lock 3.3.0", + "async-lock", "async-process", "async-recursion", "async-task", @@ -4856,14 +4918,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fceb36d0c1c4a6b98f3ce40f410e64e5a134707ed71892e1b178abc4c695d4" +checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", "zvariant_utils", ] @@ -4904,9 +4966,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877ef94e5e82b231d2a309c531f191a8152baba8241a7939ee04bd76b0171308" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" dependencies = [ "endi", "enumflags2", @@ -4917,24 +4979,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ca98581cc6a8120789d8f1f0997e9053837d6aa5346cbb43454d7121be6e39" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] diff --git a/clipcat-menu/Cargo.toml b/clipcat-menu/Cargo.toml index 0491f826..bd579327 100644 --- a/clipcat-menu/Cargo.toml +++ b/clipcat-menu/Cargo.toml @@ -27,7 +27,7 @@ clap = { version = "4", features = ["derive", "env"] } clap_complete = "4" http = "1" resolve-path = "0.1" -shadow-rs = "0.27" +shadow-rs = "0.28" skim = "0.10" snafu = "0.8" @@ -37,7 +37,7 @@ clipcat-client = { path = "../crates/client" } clipcat-external-editor = { path = "../crates/external-editor" } [build-dependencies] -shadow-rs = "0.27" +shadow-rs = "0.28" [lints] workspace = true diff --git a/clipcat-notify/Cargo.toml b/clipcat-notify/Cargo.toml index e0d1fdc3..60f01362 100644 --- a/clipcat-notify/Cargo.toml +++ b/clipcat-notify/Cargo.toml @@ -21,7 +21,7 @@ tokio = { version = "1", features = ["rt-multi-thread", "sync"] } clap = { version = "4", features = ["derive", "env"] } clap_complete = "4" mime = "0.3" -shadow-rs = "0.27" +shadow-rs = "0.28" snafu = "0.8" time = { version = "0.3", features = ["local-offset", "serde"] } @@ -29,7 +29,7 @@ clipcat-base = { path = "../crates/base" } clipcat-server = { path = "../crates/server" } [build-dependencies] -shadow-rs = "0.27" +shadow-rs = "0.28" [lints] workspace = true diff --git a/clipcatctl/Cargo.toml b/clipcatctl/Cargo.toml index 7a28afd1..dd68ab6c 100644 --- a/clipcatctl/Cargo.toml +++ b/clipcatctl/Cargo.toml @@ -30,7 +30,7 @@ directories = "5" http = "1" mime = "0.3" resolve-path = "0.1" -shadow-rs = "0.27" +shadow-rs = "0.28" simdutf8 = "0.1" snafu = "0.8" @@ -40,7 +40,7 @@ clipcat-client = { path = "../crates/client" } clipcat-external-editor = { path = "../crates/external-editor" } [build-dependencies] -shadow-rs = "0.27" +shadow-rs = "0.28" [lints] workspace = true diff --git a/clipcatd/Cargo.toml b/clipcatd/Cargo.toml index e206c7d6..0ac18dc4 100644 --- a/clipcatd/Cargo.toml +++ b/clipcatd/Cargo.toml @@ -31,7 +31,7 @@ libc = "0.2" linicon = "2" mime = "0.3" resolve-path = "0.1" -shadow-rs = "0.27" +shadow-rs = "0.28" simdutf8 = "0.1" snafu = "0.8" time = { version = "0.3", features = ["formatting", "macros"] } @@ -41,7 +41,7 @@ clipcat-cli = { path = "../crates/cli" } clipcat-server = { path = "../crates/server" } [build-dependencies] -shadow-rs = "0.27" +shadow-rs = "0.28" [lints] workspace = true From 6bc2e5e81f7c87e91ed87472a63cfa2b6e6c8e43 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 26 May 2024 23:21:27 +0800 Subject: [PATCH 28/32] feat(crates/server): add threshold for primary selection Co-authored-by: Rational-Curiosity --- crates/server/src/config.rs | 2 ++ crates/server/src/lib.rs | 2 ++ crates/server/src/manager/mod.rs | 48 +++++++++++++++++++++++++++++--- 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/crates/server/src/config.rs b/crates/server/src/config.rs index 7e7f4827..0b70e62c 100644 --- a/crates/server/src/config.rs +++ b/crates/server/src/config.rs @@ -10,6 +10,8 @@ pub struct Config { pub grpc_access_token: Option, + pub primary_threshold: time::Duration, + pub max_history: usize, pub synchronize_selection_with_clipboard: bool, diff --git a/crates/server/src/lib.rs b/crates/server/src/lib.rs index 9f70a201..0c92c07a 100644 --- a/crates/server/src/lib.rs +++ b/crates/server/src/lib.rs @@ -56,6 +56,7 @@ pub async fn serve_with_shutdown( grpc_listen_address, grpc_local_socket, grpc_access_token, + primary_threshold, max_history, history_file_path, synchronize_selection_with_clipboard, @@ -116,6 +117,7 @@ pub async fn serve_with_shutdown( let mut clipboard_manager = ClipboardManager::with_capacity( clipboard_backend.clone(), max_history, + primary_threshold, desktop_notification.clone(), ); diff --git a/crates/server/src/manager/mod.rs b/crates/server/src/manager/mod.rs index 4bf7b60a..32e64620 100644 --- a/crates/server/src/manager/mod.rs +++ b/crates/server/src/manager/mod.rs @@ -17,6 +17,8 @@ const DEFAULT_CAPACITY: usize = 40; pub struct ClipboardManager { backend: Arc, + primary_threshold: time::Duration, + capacity: usize, // use id of ClipEntry as the key @@ -40,11 +42,13 @@ where pub fn with_capacity( backend: Arc, capacity: usize, + primary_threshold: time::Duration, notification: Notification, ) -> Self { let capacity = if capacity == 0 { DEFAULT_CAPACITY } else { capacity }; Self { backend, + primary_threshold, capacity, clips: HashMap::new(), current_clips: [None; ClipboardKind::MAX_LENGTH], @@ -57,7 +61,12 @@ where #[cfg(test)] #[inline] pub fn new(backend: Arc, notification: Notification) -> Self { - Self::with_capacity(backend, DEFAULT_CAPACITY, notification) + Self::with_capacity( + backend, + DEFAULT_CAPACITY, + time::Duration::milliseconds(0), + notification, + ) } #[inline] @@ -128,6 +137,22 @@ where } ClipboardContent::Plaintext(text) => { self.notification.on_plaintext_fetched(text.chars().count()); + + if let Some(id) = self.current_clips[usize::from(entry.kind())] { + if let Some(current_clip) = self.clips.get(&id) { + if entry.timestamp() - current_clip.timestamp() < self.primary_threshold { + if let ClipboardContent::Plaintext(current_text) = current_clip.as_ref() + { + let len = text.len().min(current_text.len()); + if text[..len] == current_text[..len] { + if let Some(clip) = self.clips.remove(&id) { + let _id = self.timestamp_to_id.remove(&clip.timestamp()); + } + } + } + } + } + } } } @@ -267,7 +292,12 @@ mod tests { let cap = 20; let backend = Arc::new(LocalClipboardBackend::new()); - let mgr = ClipboardManager::with_capacity(backend, cap, notification); + let mgr = ClipboardManager::with_capacity( + backend, + cap, + time::Duration::milliseconds(0), + notification, + ); assert!(mgr.is_empty()); assert_eq!(mgr.len(), 0); assert_eq!(mgr.capacity(), cap); @@ -280,7 +310,12 @@ mod tests { let backend = Arc::new(LocalClipboardBackend::new()); let notification = DummyNotification::default(); let cap = 10; - let mut mgr = ClipboardManager::with_capacity(backend, cap, notification); + let mut mgr = ClipboardManager::with_capacity( + backend, + cap, + time::Duration::milliseconds(0), + notification, + ); assert_eq!(mgr.len(), 0); assert_eq!(mgr.capacity(), cap); @@ -336,7 +371,12 @@ mod tests { let mut clips = create_clips(n); let backend = Arc::new(LocalClipboardBackend::new()); let notification = DummyNotification::default(); - let mut mgr = ClipboardManager::with_capacity(backend, 20, notification); + let mut mgr = ClipboardManager::with_capacity( + backend, + 20, + time::Duration::milliseconds(0), + notification, + ); mgr.import(&clips); assert_eq!(mgr.len(), n); From d9724e6650e89309df2a180f494796719e08a506 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 26 May 2024 23:22:41 +0800 Subject: [PATCH 29/32] feat(clipcatd): add option for configuring threshold for primary selection Co-authored-by: Rational-Curiosity --- clipcatd/src/config/mod.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/clipcatd/src/config/mod.rs b/clipcatd/src/config/mod.rs index bde4399c..3ca683f4 100644 --- a/clipcatd/src/config/mod.rs +++ b/clipcatd/src/config/mod.rs @@ -26,6 +26,9 @@ pub struct Config { #[serde(default = "Config::default_pid_file_path")] pub pid_file: PathBuf, + #[serde(default = "Config::default_primary_threshold_ms")] + pub primary_threshold_ms: i64, + #[serde(default = "Config::default_max_history")] pub max_history: usize, @@ -62,6 +65,7 @@ impl Default for Config { Self { daemonize: true, pid_file: Self::default_pid_file_path(), + primary_threshold_ms: Self::default_primary_threshold_ms(), max_history: Self::default_max_history(), history_file_path: Self::default_history_file_path(), synchronize_selection_with_clipboard: @@ -124,6 +128,9 @@ impl Config { #[inline] pub const fn default_synchronize_selection_with_clipboard() -> bool { true } + #[inline] + pub const fn default_primary_threshold_ms() -> i64 { 5000 } + #[inline] pub const fn default_max_history() -> usize { 50 } @@ -186,6 +193,7 @@ impl From for clipcat_server::Config { fn from( Config { grpc, + primary_threshold_ms, max_history, synchronize_selection_with_clipboard, history_file_path, @@ -197,6 +205,7 @@ impl From for clipcat_server::Config { .. }: Config, ) -> Self { + let primary_threshold = time::Duration::milliseconds(primary_threshold_ms); let grpc_listen_address = grpc.enable_http.then_some(grpc.socket_address()); let grpc_local_socket = grpc.enable_local_socket.then_some(grpc.local_socket); let grpc_access_token = if let Some(file_path) = grpc.access_token_file_path { @@ -220,6 +229,7 @@ impl From for clipcat_server::Config { grpc_listen_address, grpc_local_socket, grpc_access_token, + primary_threshold, max_history, synchronize_selection_with_clipboard, history_file_path, From 828c14433bd9f730d37463a796d3b83baa2a18b2 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 26 May 2024 23:23:09 +0800 Subject: [PATCH 30/32] docs(readme): add description for configuring threshold for primary selection Co-authored-by: Rational-Curiosity --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index f3251d4b..36620e6d 100644 --- a/README.md +++ b/README.md @@ -180,6 +180,11 @@ history_file_path = "/home//.cache/clipcat/clipcatd-history" # File path of PID file, # if you omit this value, clipcatd places the PID file on `$XDG_RUNTIME_DIR/clipcatd.pid`. pid_file = "/run/user//clipcatd.pid" +# Controls how often the program updates its stored value of the Linux +# primary selection. In the Linux environment, the primary selection is a +# mechanism that automatically updates to reflect the current highlighted text or +# object, typically updating with every mouse movement. +primary_threshold_ms = 5000 [log] # Emit log message to a log file. From a6aa94281cfa38982d31420111e74e6de78906b7 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 26 May 2024 23:46:53 +0800 Subject: [PATCH 31/32] chore(nix): update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/a7146b04405d93b24a1bac76d93270787872c8be' (2024-05-19) → 'github:ipetkov/crane/701dbc191ca003a118ce885db38fae9598908294' (2024-05-25) • Updated input 'fenix': 'github:nix-community/fenix/a4b7a4acfb44ee78785b0b53667066a9b1e32245' (2024-05-18) → 'github:nix-community/fenix/aaa27b4cf3729b6562cd4dd65ba24eeda3731002' (2024-05-26) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/83ba42043166948db91fcfcfe30e0b7eac10b3d5' (2024-05-16) → 'github:rust-lang/rust-analyzer/a55e8bf09cdfc25066b77823cc98976a51af8a8b' (2024-05-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4a6b83b05df1a8bd7d99095ec4b4d271f2956b64' (2024-05-17) → 'github:NixOS/nixpkgs/bfb7a882678e518398ce9a31a881538679f6f092' (2024-05-24) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index beae2fa8..e62c3881 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1716080827, - "narHash": "sha256-2R9LBCR8TlMuK4Md9ELwPVuwRQWI3pAh7Nj9e318Hk4=", + "lastModified": 1716680724, + "narHash": "sha256-THm0mm4aKHQhh3pXCj5ms5t0sVPP9xzVsIU9byMjbtI=", "owner": "ipetkov", "repo": "crane", - "rev": "a7146b04405d93b24a1bac76d93270787872c8be", + "rev": "701dbc191ca003a118ce885db38fae9598908294", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1716054143, - "narHash": "sha256-FJJMYOmzST4gOiOo4g5XicKKALv8SWqqk2kntpIF3NM=", + "lastModified": 1716704729, + "narHash": "sha256-Yk0L1JdBTdC9ZtDreqcMMolOtTp0XnPjrACT8oTw2Wg=", "owner": "nix-community", "repo": "fenix", - "rev": "a4b7a4acfb44ee78785b0b53667066a9b1e32245", + "rev": "aaa27b4cf3729b6562cd4dd65ba24eeda3731002", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1715961556, - "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1715839492, - "narHash": "sha256-EyjtjocGLtB7tqyqwBfadP4y5BBtT5EkoG3kq/zym5U=", + "lastModified": 1716572615, + "narHash": "sha256-mVUbarr4PNjERDk+uaoitPq7eL7De0ythZehezAzug8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "83ba42043166948db91fcfcfe30e0b7eac10b3d5", + "rev": "a55e8bf09cdfc25066b77823cc98976a51af8a8b", "type": "github" }, "original": { From afd961dfd4bfa6d65574ce77b29673e35e8b9882 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 26 May 2024 23:45:55 +0800 Subject: [PATCH 32/32] build: bump version to 0.18.0 --- Cargo.lock | 47 +++++++++++++++++++++++------------------------ Cargo.toml | 2 +- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 21fcc2da..b5a254fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", @@ -554,12 +554,11 @@ dependencies = [ [[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock", "async-task", "futures-io", "futures-lite", @@ -735,7 +734,7 @@ dependencies = [ [[package]] name = "clipcat-base" -version = "0.17.0" +version = "0.18.0" dependencies = [ "bytes", "directories", @@ -755,7 +754,7 @@ dependencies = [ [[package]] name = "clipcat-cli" -version = "0.17.0" +version = "0.18.0" dependencies = [ "serde", "serde_with", @@ -766,7 +765,7 @@ dependencies = [ [[package]] name = "clipcat-client" -version = "0.17.0" +version = "0.18.0" dependencies = [ "async-trait", "clipcat-base", @@ -784,7 +783,7 @@ dependencies = [ [[package]] name = "clipcat-clipboard" -version = "0.17.0" +version = "0.18.0" dependencies = [ "arboard", "bytes", @@ -806,7 +805,7 @@ dependencies = [ [[package]] name = "clipcat-dbus-variant" -version = "0.17.0" +version = "0.18.0" dependencies = [ "clipcat-base", "mime", @@ -817,7 +816,7 @@ dependencies = [ [[package]] name = "clipcat-external-editor" -version = "0.17.0" +version = "0.18.0" dependencies = [ "clipcat-base", "snafu 0.8.3", @@ -826,7 +825,7 @@ dependencies = [ [[package]] name = "clipcat-menu" -version = "0.17.0" +version = "0.18.0" dependencies = [ "clap 4.5.4", "clap_complete", @@ -850,7 +849,7 @@ dependencies = [ [[package]] name = "clipcat-metrics" -version = "0.17.0" +version = "0.18.0" dependencies = [ "async-trait", "axum 0.7.5", @@ -866,7 +865,7 @@ dependencies = [ [[package]] name = "clipcat-notify" -version = "0.17.0" +version = "0.18.0" dependencies = [ "clap 4.5.4", "clap_complete", @@ -883,7 +882,7 @@ dependencies = [ [[package]] name = "clipcat-proto" -version = "0.17.0" +version = "0.18.0" dependencies = [ "clipcat-base", "mime", @@ -897,7 +896,7 @@ dependencies = [ [[package]] name = "clipcat-server" -version = "0.17.0" +version = "0.18.0" dependencies = [ "async-trait", "bincode", @@ -933,7 +932,7 @@ dependencies = [ [[package]] name = "clipcatctl" -version = "0.17.0" +version = "0.18.0" dependencies = [ "bytes", "clap 4.5.4", @@ -960,7 +959,7 @@ dependencies = [ [[package]] name = "clipcatd" -version = "0.17.0" +version = "0.18.0" dependencies = [ "clap 4.5.4", "clap_complete", @@ -3061,9 +3060,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -3440,18 +3439,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 420a17d2..0d11877d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.17.0" +version = "0.18.0" authors = ["xrelkd <46590321+xrelkd@users.noreply.github.com>"] homepage = "https://github.com/xrelkd/clipcat" repository = "https://github.com/xrelkd/clipcat"