From 7a975eae0265c7d9d2bf12d835fff6e67ac7cb9d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 2 Mar 2026 23:02:50 +0100 Subject: [PATCH 1/4] update config parser to 0.15 Signed-off-by: Robin Appelman --- Cargo.lock | 76 +++++++++++++++++++++++++++++++++--------------------- Cargo.toml | 2 +- 2 files changed, 48 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee3fcd1e..05aeea7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -605,7 +605,7 @@ dependencies = [ "log", "nu-ansi-term", "regex", - "thiserror 2.0.12", + "thiserror 2.0.18", ] [[package]] @@ -819,6 +819,12 @@ dependencies = [ "foldhash", ] +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + [[package]] name = "hashlink" version = "0.10.0" @@ -1204,12 +1210,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.10.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", - "hashbrown 0.15.5", + "hashbrown 0.16.1", ] [[package]] @@ -1514,15 +1520,16 @@ dependencies = [ [[package]] name = "nextcloud-config-parser" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "476862d9d10fea6be6e12f8b08474c82758b44b5920ff30f1bb79f077aa5de63" +checksum = "e19c4fd4542c4792ae42654a57f548b307f7832282bbd2bc43ec28e27bb059b6" dependencies = [ "form_urlencoded", + "indexmap", "itertools", "miette", "php-literal-parser", - "thiserror 2.0.12", + "thiserror 2.0.18", "urlencoding", ] @@ -1564,7 +1571,7 @@ dependencies = [ "smallvec", "sqlx", "test_client", - "thiserror 2.0.12", + "thiserror 2.0.18", "tokio", "tokio-stream", "tokio-tungstenite 0.26.2", @@ -1774,16 +1781,17 @@ checksum = "f658886ed52e196e850cfbbfddab9eaa7f6d90dd0929e264c31e5cec07e09e57" [[package]] name = "php-literal-parser" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40cbf30b4bfd25634ea46eea71f99f6d214b4302d14290c07c390b9f9e9b95e8" +checksum = "16b3376c792ce8b0f5f2ca29fcf6e3cb104961b9ffc89c97c268c45596f0e334" dependencies = [ + "indexmap", "logos", "memchr", "miette", "parse-display 0.9.1", - "serde", - "thiserror 1.0.69", + "serde_core", + "thiserror 2.0.18", ] [[package]] @@ -1916,7 +1924,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.31", "socket2 0.5.10", - "thiserror 2.0.12", + "thiserror 2.0.18", "tokio", "tracing", "web-time", @@ -1937,7 +1945,7 @@ dependencies = [ "rustls 0.23.31", "rustls-pki-types", "slab", - "thiserror 2.0.12", + "thiserror 2.0.18", "tinyvec", "tracing", "web-time", @@ -2384,18 +2392,28 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -2577,7 +2595,7 @@ dependencies = [ "serde_json", "sha2", "smallvec", - "thiserror 2.0.12", + "thiserror 2.0.18", "tokio", "tokio-stream", "tracing", @@ -2660,7 +2678,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.12", + "thiserror 2.0.18", "tracing", "whoami", ] @@ -2697,7 +2715,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror 2.0.12", + "thiserror 2.0.18", "tracing", "whoami", ] @@ -2721,7 +2739,7 @@ dependencies = [ "serde", "serde_urlencoded", "sqlx-core", - "thiserror 2.0.12", + "thiserror 2.0.18", "tracing", "url", ] @@ -2946,11 +2964,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl 2.0.18", ] [[package]] @@ -2966,9 +2984,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -3280,7 +3298,7 @@ dependencies = [ "rustls 0.23.31", "rustls-pki-types", "sha1", - "thiserror 2.0.12", + "thiserror 2.0.18", "url", "utf-8", "webpki-roots 0.26.11", diff --git a/Cargo.toml b/Cargo.toml index 7553144b..686c61dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ rand = { version = "0.8.5", features = ["small_rng"] } ahash = "0.8.12" flexi_logger = { version = "0.29.8", features = ["colors"] } tokio-stream = { version = "0.1.17", features = ["net"] } -nextcloud-config-parser = "0.14.1" +nextcloud-config-parser = "0.15.0" url = "2.5.4" clap = { version = "4.5.43", features = ["derive"] } sd-notify = { version = "0.4.5", optional = true } From 931b03e0d01f199588a03ce588cde99e91f4d95c Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 2 Mar 2026 23:07:39 +0100 Subject: [PATCH 2/4] chore: bumb msrv Signed-off-by: Robin Appelman --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 686c61dc..e0a9eec5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ name = "notify_push" version = "0.1.0" # this version number is unused, the version number for the binary will be extracted from the appinfo/info.xml during build authors = ["Robin Appelman "] edition = "2021" -rust-version = "1.85.0" +rust-version = "1.88.0" [dependencies] redis = { version = "0.31.0", default-features = false, features = ["tokio-comp", "aio", "cluster", "cluster-async", "keep-alive", "tls-rustls", "tokio-rustls-comp", "tls-rustls-webpki-roots", "tls-rustls-insecure"] } From bc38bd52bc334938a2f7eec07f767c8c75c2e80f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 4 Mar 2026 14:45:15 +0100 Subject: [PATCH 3/4] update MSRV in DEVELOPING.md Signed-off-by: Robin Appelman --- DEVELOPING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPING.md b/DEVELOPING.md index fa724b84..82bf92d5 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -129,7 +129,7 @@ listen('my_message_type', (message_type, optional_body) => { ## Building -The server binary is built using rust and cargo, and requires a minimum of rust `1.85`. +The server binary is built using rust and cargo, and requires a minimum of rust `1.88`. - Install `rust` through your package manager or [rustup](https://rustup.rs/) - Run `cargo build` From 1d3b1a1b1f65a4bd9b88a01b84ab8bfac8b398c1 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 4 Mar 2026 15:07:58 +0100 Subject: [PATCH 4/4] update config parser to 0.15.1 Signed-off-by: Robin Appelman --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 05aeea7c..8dcc5c81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1520,9 +1520,9 @@ dependencies = [ [[package]] name = "nextcloud-config-parser" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19c4fd4542c4792ae42654a57f548b307f7832282bbd2bc43ec28e27bb059b6" +checksum = "94a63b1374e3d837e53a783c0704013728ef392899f131b389cdda0ef922b945" dependencies = [ "form_urlencoded", "indexmap", diff --git a/Cargo.toml b/Cargo.toml index e0a9eec5..8b88421b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ rand = { version = "0.8.5", features = ["small_rng"] } ahash = "0.8.12" flexi_logger = { version = "0.29.8", features = ["colors"] } tokio-stream = { version = "0.1.17", features = ["net"] } -nextcloud-config-parser = "0.15.0" +nextcloud-config-parser = "0.15.1" url = "2.5.4" clap = { version = "4.5.43", features = ["derive"] } sd-notify = { version = "0.4.5", optional = true }