From 0e202e94267049a88d605ea143fd76ddac03583e Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Tue, 17 Feb 2026 12:33:19 +0100 Subject: [PATCH 1/3] move to rust 1.93 --- rust-toolchain.toml | 2 +- zenoh-jni/Cargo.lock | 367 +++++++++++++++++++------------------------ zenoh-jni/Cargo.toml | 4 +- 3 files changed, 165 insertions(+), 208 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c1bc0a69..075062e5 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.85.0" +channel = "1.93.0" diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock index 321b1e66..2cf7dc8a 100644 --- a/zenoh-jni/Cargo.lock +++ b/zenoh-jni/Cargo.lock @@ -176,9 +176,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.6.0" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" [[package]] name = "bincode" @@ -233,9 +233,9 @@ checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "cc" -version = "1.2.53" +version = "1.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932" +checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583" dependencies = [ "find-msvc-tools", "shlex", @@ -518,12 +518,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.4.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", - "serde", + "serde_core", ] [[package]] @@ -915,11 +915,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.9" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -970,21 +970,22 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_locale_core" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -993,99 +994,61 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ - "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", + "icu_locale_core", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.114", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1105,9 +1068,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -1126,9 +1089,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.11.4" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", "hashbrown 0.16.1", @@ -1263,9 +1226,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" @@ -1279,9 +1242,9 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "lock_api" @@ -1306,9 +1269,9 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "lz4_flex" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" +checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a" dependencies = [ "twox-hash", ] @@ -1438,9 +1401,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" [[package]] name = "num-integer" @@ -1567,20 +1530,19 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.0" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6" +checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7" dependencies = [ "memchr", - "thiserror 2.0.18", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.8.0" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5" +checksum = "68f9dbced329c441fa79d80472764b1a2c7e57123553b8519b36663a2fb234ed" dependencies = [ "pest", "pest_generator", @@ -1588,9 +1550,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.0" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841" +checksum = "3bb96d5051a78f44f43c8f712d8e810adb0ebf923fc9ed2655a7f66f63ba8ee5" dependencies = [ "pest", "pest_meta", @@ -1601,11 +1563,10 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.8.0" +version = "2.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0" +checksum = "602113b5b5e8621770cfd490cfd90b9f84ab29bd2b0e49ad83eb6d186cef2365" dependencies = [ - "once_cell", "pest", "sha2", ] @@ -1618,7 +1579,7 @@ checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" dependencies = [ "fixedbitset", "hashbrown 0.15.5", - "indexmap 2.11.4", + "indexmap 2.13.0", "serde", ] @@ -1756,6 +1717,15 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" +[[package]] +name = "potential_utf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -1802,7 +1772,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.6.1", + "socket2 0.6.2", "thiserror 2.0.18", "tokio", "tracing", @@ -1841,16 +1811,16 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.1", + "socket2 0.6.2", "tracing", "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] @@ -2333,28 +2303,27 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2789234a13a53fc4be1b51ea1bab45a3c338bdb884862a257d10e5a74ae009e6" +checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" dependencies = [ "serde_core", ] [[package]] name = "serde_with" -version = "3.14.1" +version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e" +checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" dependencies = [ "base64", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.11.4", + "indexmap 2.13.0", "schemars 0.9.0", "schemars 1.2.0", - "serde", - "serde_derive", + "serde_core", "serde_json", "serde_with_macros", "time", @@ -2362,9 +2331,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.14.1" +version = "3.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e" +checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" dependencies = [ "darling", "proc-macro2", @@ -2378,7 +2347,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.13.0", "itoa", "ryu", "serde", @@ -2493,9 +2462,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" dependencies = [ "libc", "windows-sys 0.60.2", @@ -2567,12 +2536,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.10.0" @@ -2690,30 +2653,30 @@ dependencies = [ [[package]] name = "time" -version = "0.3.41" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5" dependencies = [ "deranged", "itoa", "num-conv", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.22" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4" dependencies = [ "num-conv", "time-core", @@ -2721,9 +2684,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -2746,9 +2709,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tls-listener" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab41256c16d6fc2b3021545f20bf77a73200b18bd54040ac656dddfca6205bfa" +checksum = "1461056cc1ef47003f7ee16e4cef3741068d4c7f6b627bfce49b7c00c120a530" dependencies = [ "futures-util", "pin-project-lite", @@ -2778,7 +2741,7 @@ dependencies = [ "libc", "mio", "pin-project-lite", - "socket2 0.6.1", + "socket2 0.6.2", "tokio-macros", "windows-sys 0.61.2", ] @@ -2832,11 +2795,11 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.6" +version = "0.9.11+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae2a4cf385da23d1d53bc15cdfa5c2109e93d8d362393c801e87da2f72f0e201" +checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.13.0", "serde_core", "serde_spanned", "toml_datetime", @@ -2847,20 +2810,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.1" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a197c0ec7d131bfc6f7e82c8442ba1595aeab35da7adbf05b6b73cd06a16b6be" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] [[package]] name = "toml_edit" -version = "0.23.5" +version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad0b7ae9cfeef5605163839cb9221f453399f15cfb5c10be9885fcf56611f9" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ - "indexmap 2.11.4", + "indexmap 2.13.0", "toml_datetime", "toml_parser", "winnow", @@ -2868,18 +2831,18 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.2" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow", ] [[package]] name = "toml_writer" -version = "1.0.2" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64" +checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" [[package]] name = "tracing" @@ -2976,13 +2939,9 @@ dependencies = [ [[package]] name = "twox-hash" -version = "1.6.3" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] +checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" [[package]] name = "typeid" @@ -3042,13 +3001,13 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "unzip-n" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c" +checksum = "3b5bb2756c16fb66f80cfbf5fb0e0c09a7001e739f453c9ec241b9c8b1556fda" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.114", ] [[package]] @@ -3069,12 +3028,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -3083,9 +3036,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" +checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f" dependencies = [ "getrandom 0.3.4", "js-sys", @@ -3559,17 +3512,11 @@ version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "x509-parser" @@ -3590,11 +3537,10 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -3602,9 +3548,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", @@ -3615,7 +3561,7 @@ dependencies = [ [[package]] name = "zenoh" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "ahash", "arc-swap", @@ -3665,7 +3611,7 @@ dependencies = [ [[package]] name = "zenoh-buffers" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "zenoh-collections", ] @@ -3673,7 +3619,7 @@ dependencies = [ [[package]] name = "zenoh-codec" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "tracing", "uhlc", @@ -3684,7 +3630,7 @@ dependencies = [ [[package]] name = "zenoh-collections" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "ahash", ] @@ -3692,7 +3638,7 @@ dependencies = [ [[package]] name = "zenoh-config" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "json5", "nonempty-collections", @@ -3717,7 +3663,7 @@ dependencies = [ [[package]] name = "zenoh-core" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "lazy_static", "tokio", @@ -3728,7 +3674,7 @@ dependencies = [ [[package]] name = "zenoh-crypto" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "aes", "hmac", @@ -3741,7 +3687,7 @@ dependencies = [ [[package]] name = "zenoh-ext" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "bincode", @@ -3760,7 +3706,7 @@ dependencies = [ [[package]] name = "zenoh-keyexpr" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "getrandom 0.2.17", "hashbrown 0.16.1", @@ -3775,7 +3721,7 @@ dependencies = [ [[package]] name = "zenoh-link" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "zenoh-config", "zenoh-link-commons", @@ -3793,7 +3739,7 @@ dependencies = [ [[package]] name = "zenoh-link-commons" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "base64", @@ -3826,7 +3772,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "base64", @@ -3851,7 +3797,7 @@ dependencies = [ [[package]] name = "zenoh-link-quic_datagram" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "quinn", @@ -3871,7 +3817,7 @@ dependencies = [ [[package]] name = "zenoh-link-tcp" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "socket2 0.5.10", @@ -3888,7 +3834,7 @@ dependencies = [ [[package]] name = "zenoh-link-tls" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "base64", @@ -3917,7 +3863,7 @@ dependencies = [ [[package]] name = "zenoh-link-udp" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "libc", @@ -3938,7 +3884,7 @@ dependencies = [ [[package]] name = "zenoh-link-unixsock_stream" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "nix", @@ -3956,7 +3902,7 @@ dependencies = [ [[package]] name = "zenoh-link-ws" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "futures-util", @@ -3976,7 +3922,7 @@ dependencies = [ [[package]] name = "zenoh-macros" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "proc-macro2", "quote", @@ -3987,7 +3933,7 @@ dependencies = [ [[package]] name = "zenoh-plugin-trait" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "git-version", "libloading", @@ -4004,7 +3950,7 @@ dependencies = [ [[package]] name = "zenoh-protocol" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "const_format", "rand 0.8.5", @@ -4019,7 +3965,7 @@ dependencies = [ [[package]] name = "zenoh-result" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "anyhow", ] @@ -4027,7 +3973,7 @@ dependencies = [ [[package]] name = "zenoh-runtime" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "lazy_static", "ron", @@ -4041,7 +3987,7 @@ dependencies = [ [[package]] name = "zenoh-sync" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "arc-swap", "event-listener", @@ -4055,7 +4001,7 @@ dependencies = [ [[package]] name = "zenoh-task" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "futures", "tokio", @@ -4068,7 +4014,7 @@ dependencies = [ [[package]] name = "zenoh-transport" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "crossbeam-utils", @@ -4101,7 +4047,7 @@ dependencies = [ [[package]] name = "zenoh-util" version = "1.7.2" -source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#594637cef8fa33f16ee0447b82ac3966bee251ab" +source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=ci/zenoh_1_75#614b5356472d295d121f4a760d5b3a6ed26808d3" dependencies = [ "async-trait", "const_format", @@ -4144,18 +4090,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" +checksum = "71ddd76bcebeed25db614f82bf31a9f4222d3fbba300e6fb6c00afa26cbd4d9d" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" +checksum = "d8187381b52e32220d50b255276aa16a084ec0a9017a0ca2152a1f55c539758d" dependencies = [ "proc-macro2", "quote", @@ -4164,9 +4110,9 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] @@ -4189,11 +4135,22 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +[[package]] +name = "zerotrie" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -4202,9 +4159,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", @@ -4213,6 +4170,6 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65" +checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439" diff --git a/zenoh-jni/Cargo.toml b/zenoh-jni/Cargo.toml index 17bec2e9..35c919f3 100644 --- a/zenoh-jni/Cargo.toml +++ b/zenoh-jni/Cargo.toml @@ -36,8 +36,8 @@ flume = "0.10.14" uhlc = "0.8.0" json5 = "0.4.1" serde_yaml = "0.9.19" -zenoh = { version = "1.7.2", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable", "internal"], default-features = false } -zenoh-ext = { version = "1.7.2", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["internal"], default-features = false, optional = true } +zenoh = { version = "1.7.2", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "ci/zenoh_1_75", features = ["unstable", "internal"], default-features = false } +zenoh-ext = { version = "1.7.2", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "ci/zenoh_1_75", features = ["internal"], default-features = false, optional = true } tracing = { version = "0.1" , features = ["log"] } [lib] name = "zenoh_jni" From bebfcfaff9ef3f13312def00433395c2a963aa58 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Tue, 17 Feb 2026 13:59:09 +0100 Subject: [PATCH 2/3] rust 1.75 test removed, no crago lock test added --- .github/workflows/ci.yml | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97a65301..61a9fb86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,9 +38,12 @@ jobs: working-directory: zenoh-jni run: cargo fmt --all --check - - name: Clippy Check + - name: Clippy Check without Cargo.lock working-directory: zenoh-jni - run: cargo clippy --all-targets --all-features -- -D warnings + run: | + mv Cargo.lock Cargo.lock.bak + cargo clippy --all-targets --all-features -- -D warnings + mv Cargo.lock.bak Cargo.lock - name: Check for feature leaks working-directory: zenoh-jni @@ -67,28 +70,6 @@ jobs: config: '.markdownlint.yaml' globs: '**/README.md' - check_rust: - name: Check zenoh-java using Rust 1.75 - runs-on: ubuntu-latest - strategy: - fail-fast: false - steps: - - name: Clone this repository - uses: actions/checkout@v4 - - - name: Update Rust 1.75.0 toolchain - run: rustup update 1.75.0 - - - name: Setup rust-cache - uses: Swatinem/rust-cache@v2 - with: - cache-bin: false - - - name: Check zenoh-java with rust 1.75.0 - run: | - cd zenoh-jni - cargo +1.75.0 check --release --bins --lib - # NOTE: In GitHub repository settings, the "Require status checks to pass # before merging" branch protection rule ensures that commits are only merged # from branches where specific status checks have passed. These checks are @@ -97,7 +78,7 @@ jobs: ci: name: CI status checks runs-on: ubuntu-latest - needs: [check_rust, build, markdown_lint] + needs: [build, markdown_lint] if: always() steps: - name: Check whether all jobs pass From d70d0510173a9cbe2eef29092e2664c89d01254d Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Tue, 17 Feb 2026 14:19:05 +0100 Subject: [PATCH 3/3] clippy fix --- zenoh-jni/src/querier.rs | 4 ++-- zenoh-jni/src/query.rs | 14 +++++++------- zenoh-jni/src/session.rs | 28 ++++++++++++++-------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/zenoh-jni/src/querier.rs b/zenoh-jni/src/querier.rs index f8af486b..8c239498 100644 --- a/zenoh-jni/src/querier.rs +++ b/zenoh-jni/src/querier.rs @@ -42,9 +42,9 @@ use crate::{ /// - `_class`: The JNI class. /// - `querier_ptr`: The raw pointer to the querier. /// - `key_expr_ptr`: A raw pointer to the [KeyExpr] provided to the kotlin querier. May be null in case of using an -/// undeclared key expression. +/// undeclared key expression. /// - `key_expr_str`: String representation of the key expression used during the querier declaration. -/// It won't be considered in case a key_expr_ptr to a declared key expression is provided. +/// It won't be considered in case a key_expr_ptr to a declared key expression is provided. /// - `selector_params`: Optional selector parameters for the query. /// - `callback`: Reference to the Kotlin callback to be run upon receiving a reply. /// - `on_close`: Reference to a kotlin callback to be run upon finishing the get operation, mostly used for closing a provided channel. diff --git a/zenoh-jni/src/query.rs b/zenoh-jni/src/query.rs index 031b1d93..a5c601e3 100644 --- a/zenoh-jni/src/query.rs +++ b/zenoh-jni/src/query.rs @@ -38,8 +38,8 @@ use zenoh::{ /// - `_class`: The JNI class. /// - `query_ptr`: The raw pointer to the Zenoh query. /// - `key_expr_ptr`: Nullable key expression pointer associated with the query result. This parameter -/// is meant to be used with declared key expressions, which have a pointer associated to them. -/// In case of it being null, then the `key_expr_string` will be used to perform the reply. +/// is meant to be used with declared key expressions, which have a pointer associated to them. +/// In case of it being null, then the `key_expr_string` will be used to perform the reply. /// - `key_expr_str`: The string representation of the key expression associated with the query result. /// - `payload`: The payload for the reply. /// - `encoding_id`: The encoding id of the payload. @@ -53,7 +53,7 @@ use zenoh::{ /// - This function is marked as unsafe due to raw pointer manipulation and JNI interaction. /// - It assumes that the provided raw pointer to the Zenoh query is valid and has not been modified or freed. /// - The query pointer is freed after calling this function (queries shouldn't be replied more than once), -/// therefore the query isn't valid anymore after that. +/// therefore the query isn't valid anymore after that. /// - May throw a JNI exception in case of failure, which should be handled by the caller. /// #[no_mangle] @@ -115,7 +115,7 @@ pub(crate) unsafe extern "C" fn Java_io_zenoh_jni_JNIQuery_replySuccessViaJNI( /// - It assumes that the provided raw pointer to the Zenoh query is valid and has not been modified or freed. /// - May throw a JNI exception in case of failure, which should be handled by the caller. /// - The query pointer is freed after calling this function (queries shouldn't be replied more than once), -/// therefore the query isn't valid anymore after that. +/// therefore the query isn't valid anymore after that. /// #[no_mangle] #[allow(non_snake_case)] @@ -146,8 +146,8 @@ pub(crate) unsafe extern "C" fn Java_io_zenoh_jni_JNIQuery_replyErrorViaJNI( /// - `_class`: The JNI class. /// - `query_ptr`: The raw pointer to the Zenoh query. /// - `key_expr_ptr`: Nullable key expression pointer associated with the query result. This parameter -/// is meant to be used with declared key expressions, which have a pointer associated to them. -/// In case of it being null, then the `key_expr_string` will be used to perform the reply. +/// is meant to be used with declared key expressions, which have a pointer associated to them. +/// In case of it being null, then the `key_expr_string` will be used to perform the reply. /// - `key_expr_str`: The string representation of the key expression associated with the query result. /// - `timestamp_enabled`: A boolean indicating whether the timestamp is enabled. /// - `timestamp_ntp_64`: The NTP64 timestamp value. @@ -159,7 +159,7 @@ pub(crate) unsafe extern "C" fn Java_io_zenoh_jni_JNIQuery_replyErrorViaJNI( /// - It assumes that the provided raw pointer to the Zenoh query is valid and has not been modified or freed. /// - May throw a JNI exception in case of failure, which should be handled by the caller. /// - The query pointer is freed after calling this function (queries shouldn't be replied more than once), -/// therefore the query isn't valid anymore after that. +/// therefore the query isn't valid anymore after that. /// #[no_mangle] #[allow(non_snake_case)] diff --git a/zenoh-jni/src/session.rs b/zenoh-jni/src/session.rs index d787c906..fbff716f 100644 --- a/zenoh-jni/src/session.rs +++ b/zenoh-jni/src/session.rs @@ -194,8 +194,8 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNISession_closeSessionViaJNI( /// - `_class`: The JNI class. /// - `key_expr_ptr`: Raw pointer to the [KeyExpr] to be used for the publisher, may be null. /// - `key_expr_str`: String representation of the [KeyExpr] to be used for the publisher. -/// It is only considered when the key_expr_ptr parameter is null, meaning the function is -/// receiving a key expression that was not declared. +/// It is only considered when the key_expr_ptr parameter is null, meaning the function is +/// receiving a key expression that was not declared. /// - `session_ptr`: Raw pointer to the Zenoh [Session] to be used for the publisher. /// - `congestion_control`: The [zenoh::publisher::CongestionControl] configuration as an ordinal. /// - `priority`: The [zenoh::core::Priority] configuration as an ordinal. @@ -258,8 +258,8 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNISession_declarePublisherViaJNI( /// - `_class`: The JNI class. /// - `key_expr_ptr`: Raw pointer to the [KeyExpr] to be used for the operation, may be null. /// - `key_expr_str`: String representation of the [KeyExpr] to be used for the operation. -/// It is only considered when the key_expr_ptr parameter is null, meaning the function is -/// receiving a key expression that was not declared. +/// It is only considered when the key_expr_ptr parameter is null, meaning the function is +/// receiving a key expression that was not declared. /// - `session_ptr`: Raw pointer to the [Session] to be used for the operation. /// - `payload`: The payload to send through the network. /// - `encoding_id`: The encoding id of the payload. @@ -332,8 +332,8 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNISession_putViaJNI( /// - `_class`: The JNI class. /// - `key_expr_ptr`: Raw pointer to the [KeyExpr] to be used for the operation, may be null. /// - `key_expr_str`: String representation of the [KeyExpr] to be used for the operation. -/// It is only considered when the key_expr_ptr parameter is null, meaning the function is -/// receiving a key expression that was not declared. +/// It is only considered when the key_expr_ptr parameter is null, meaning the function is +/// receiving a key expression that was not declared. /// - `session_ptr`: Raw pointer to the [Session] to be used for the operation. /// - `congestion_control`: The [CongestionControl] mechanism specified. /// - `priority`: The [Priority] mechanism specified. @@ -397,9 +397,9 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNISession_deleteViaJNI( /// - `env`: The JNI environment. /// - `_class`: The JNI class. /// - `key_expr_ptr`: The key expression pointer for the subscriber. May be null in case of using an -/// undeclared key expression. +/// undeclared key expression. /// - `key_expr_str`: String representation of the key expression to be used to declare the subscriber. -/// It won't be considered in case a key_expr_ptr to a declared key expression is provided. +/// It won't be considered in case a key_expr_ptr to a declared key expression is provided. /// - `session_ptr`: The raw pointer to the Zenoh session. /// - `callback`: The callback function as an instance of the `JNISubscriberCallback` interface in Java/Kotlin. /// - `on_close`: A Java/Kotlin `JNIOnCloseCallback` function interface to be called upon closing the subscriber. @@ -522,9 +522,9 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNISession_declareSubscriberViaJNI( /// - `env`: The JNI environment. /// - `_class`: The JNI class. /// - `key_expr_ptr`: A raw pointer to the [KeyExpr] to be used for the querier. May be null in case of using an -/// undeclared key expression. +/// undeclared key expression. /// - `key_expr_str`: String representation of the key expression to be used to declare the querier. -/// It won't be considered in case a key_expr_ptr to a declared key expression is provided. +/// It won't be considered in case a key_expr_ptr to a declared key expression is provided. /// - `target`: The ordinal value of the query target enum value. /// - `consolidation`: The ordinal value of the consolidation enum value. /// - `congestion_control`: The ordinal value of the congestion control enum value. @@ -585,9 +585,9 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNISession_declareQuerierViaJNI( /// - `env`: The JNI environment. /// - `_class`: The JNI class. /// - `key_expr_ptr`: A raw pointer to the [KeyExpr] to be used for the queryable. May be null in case of using an -/// undeclared key expression. +/// undeclared key expression. /// - `key_expr_str`: String representation of the key expression to be used to declare the queryable. -/// It won't be considered in case a key_expr_ptr to a declared key expression is provided. +/// It won't be considered in case a key_expr_ptr to a declared key expression is provided. /// - `session_ptr`: A raw pointer to the Zenoh [Session] to be used to declare the queryable. /// - `callback`: The callback function as an instance of the `JNIQueryableCallback` interface in Java/Kotlin. /// - `on_close`: A Java/Kotlin `JNIOnCloseCallback` function interface to be called upon closing the queryable. @@ -840,9 +840,9 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNISession_undeclareKeyExprViaJNI( /// - `env`: The JNI environment. /// - `_class`: The JNI class. /// - `key_expr_ptr`: Raw pointer to a declared [KeyExpr] to be used for the query. May be null in case -/// of using a non declared key expression, in which case the `key_expr_str` parameter will be used instead. +/// of using a non declared key expression, in which case the `key_expr_str` parameter will be used instead. /// - `key_expr_str`: String representation of the key expression to be used to declare the query. It is not -/// considered if a `key_expr_ptr` is provided. +/// considered if a `key_expr_ptr` is provided. /// - `selector_params`: Optional parameters of the selector. /// - `session_ptr`: A raw pointer to the Zenoh [Session]. /// - `callback`: A Java/Kotlin callback to be called upon receiving a reply.