diff --git a/Cargo.lock b/Cargo.lock index aaaa65f..7ec3983 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -101,11 +101,20 @@ version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" +[[package]] +name = "ar_archive_writer" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523e5e187fff36fcb8d1d19ccf0ca4ca43ec3d158316057f66dc6f72716bc5ec" +dependencies = [ + "object", +] + [[package]] name = "arc-swap" -version = "1.9.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380962b3d93b99642e50b9febf72c071e97e8b32d86eae9cf4ef582bb960ae6e" +checksum = "84a22b5d51209f6de83d37a0b33d320acb8da88823e42a94c075140708f032a5" dependencies = [ "rustversion", ] @@ -124,7 +133,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -153,18 +162,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "attohttpc" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e2cdb6d5ed835199484bb92bb8b3edd526effe995c61732580439c1a67e2e9" -dependencies = [ - "base64 0.22.1", - "http", - "log", - "url", -] - [[package]] name = "autocfg" version = "1.5.1" @@ -217,9 +214,9 @@ dependencies = [ [[package]] name = "bit-vec" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269" +checksum = "72503af1e72be411d74ca45cd6b309878fcb35354e252fc2a3a8bda3a97082a0" dependencies = [ "borsh", "serde", @@ -249,7 +246,7 @@ dependencies = [ "arrayvec", "cc", "cfg-if", - "constant_time_eq", + "constant_time_eq 0.4.2", "cpufeatures 0.3.1", ] @@ -291,7 +288,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -315,14 +312,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] name = "bstr" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb31b46c14244e20ee9984b11bf5c992b91fb6939fea616e3512c8baecdbe5f" +checksum = "a680398c10c7bc0488067c4612226ea905a85f607134b69f3068d505d58c4214" dependencies = [ "memchr", "serde_core", @@ -330,9 +327,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.20.3" +version = "3.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" +checksum = "87a0cf66fd1eb2fb7b822cb78370d82303750809bc6ba855f3f58e517d3238db" [[package]] name = "bytecount" @@ -354,9 +351,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.12.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" +checksum = "776dfebd015e2d8732c684a2c71003674ccb49457b539b9e82151ba38e96dd7c" dependencies = [ "serde", ] @@ -375,9 +372,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.11.0" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375989decec1a0fa424442bed520fa12ede43a48475ce8c7417d2c69b32b5f6b" +checksum = "02f0e023adb368345ce0ca6cdfc0f24a06554468d0e8503e14a0841de79bfa69" dependencies = [ "find-msvc-tools", "jobserver", @@ -431,7 +428,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -473,9 +470,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.7" +version = "4.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946" +checksum = "844c5c0b65be192cb68d570cca1b21a6444431d24e39c084dc0336177015337c" dependencies = [ "clap_builder", ] @@ -492,9 +489,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" +checksum = "e0921b3876b3a1df8a1c9f912e7f94342458022c2e84288015893d83c4d62a79" [[package]] name = "cmov" @@ -538,9 +535,9 @@ checksum = "ea0095f6103c2a8b44acd6fd15960c801dafebf02e21940360833e0673f48ba7" [[package]] name = "const-oid" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" +checksum = "be95d4a884358a21a199689323c29e9256b4a1b315e22f183d155422041d3a9a" [[package]] name = "const_format" @@ -569,6 +566,15 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" +[[package]] +name = "constant_time_eq" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eb6feb175df65d0a3ccd3e73484e940d0ac664e8034f0519fd49a93db3071d9" +dependencies = [ + "rustversion", +] + [[package]] name = "convert_case" version = "0.10.0" @@ -667,9 +673,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f97d3416d5337d15c4b0d78c8c91df922ca143f57ec20e2d1c188333047ef04" +checksum = "2b929dd2a135771f40afabd1073f85eed59c800b7c61901e5c254270497dad64" dependencies = [ "cfg-if", ] @@ -873,7 +879,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -884,7 +890,7 @@ checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" dependencies = [ "darling_core", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -924,7 +930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c54e03a951783e8b327515db3f2a2fd0e3bed362a96b066f341ce66ed49b4ead" dependencies = [ "data-encoding", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1034,7 +1040,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1054,6 +1060,12 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc" +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + [[package]] name = "ed25519" version = "3.0.0" @@ -1104,13 +1116,13 @@ checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" [[package]] name = "enum-assoc" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0590c4a94da3372e83493b956755a6e2266830b6e4e3b101afe66e3f39477b91" +checksum = "378cfad7ff892555026001b3bb6c2becb98f0aafcd7ddccd5dfa506977f17c8a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1144,9 +1156,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +checksum = "e35d6e78f4cebb90e51d543db8fe41528851d6deeef6ef21ebd4bfdc1e784776" dependencies = [ "libc", "windows-sys 0.61.2", @@ -1178,9 +1190,9 @@ checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48" [[package]] name = "fixedbitset" -version = "0.5.7" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" +checksum = "5905ec755cc8386d7928353e4d356d2be3e89e81e5ca01fe630a1ca4d08dc175" [[package]] name = "fjall" @@ -1194,16 +1206,16 @@ dependencies = [ "flume", "log", "lsm-tree", - "lz4_flex 0.13.1", + "lz4_flex 0.13.2", "tempfile", "xxhash-rust", ] [[package]] name = "flate2" -version = "1.1.10" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" +checksum = "626d4928326b646e70f65ed36fc7cf9f206bdb68a0019ee7c6b4709da4e084c4" dependencies = [ "zlib-rs", ] @@ -1237,9 +1249,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "form_urlencoded" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +checksum = "afa489199eaffb1211795df1c6236ce1ad0d41a6fa45250add73e3b02420f06e" dependencies = [ "percent-encoding", ] @@ -1287,12 +1299,13 @@ dependencies = [ [[package]] name = "futures-buffered" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4421cb78ee172b6b06080093479d3c50f058e7c81b7d577bbb8d118d551d4cd5" +checksum = "1bf9d35e4228d3bef48dfd0ceb615166ee3eb869a5bfc1923d7d47340a1e5684" dependencies = [ "cordyceps", "diatomic-waker", + "fixedbitset", "futures-core", "pin-project-lite", "spin 0.10.1", @@ -1352,7 +1365,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1386,17 +1399,16 @@ dependencies = [ [[package]] name = "generator" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be81b31c9ce4caf7f3178eeb90662bb1864d3ad363ec6bdada3201adff19c37" +checksum = "ea6c6a73cd1aa4f4f00c02b109fa55d3a9d6ecc2fc4f53177b74ed6ee23b0c53" dependencies = [ "cc", - "cfg-if", "libc", "log", "rustversion", - "windows-link", - "windows-result", + "windows-core 0.100.0", + "windows-sys 0.61.2", ] [[package]] @@ -1715,7 +1727,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core", + "windows-core 0.62.2", ] [[package]] @@ -1845,11 +1857,10 @@ dependencies = [ [[package]] name = "igd-next" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de7238d487a9aff61f81b5ab41c0a841532a115a398b5fa92a2fadd0885e2581" +checksum = "c71312255fdc5364bff7eec0adf68146bc4e72aba85075261af40d234c11be99" dependencies = [ - "attohttpc", "bytes", "futures", "http", @@ -1857,9 +1868,11 @@ dependencies = [ "hyper", "hyper-util", "log", - "rand 0.10.3", + "rand 0.10.4", + "thiserror 2.0.21", "tokio", "url", + "xml-rs", "xmltree", ] @@ -1939,7 +1952,7 @@ dependencies = [ "socket2", "widestring", "windows-registry", - "windows-result", + "windows-result 0.4.1", "windows-sys 0.61.2", ] @@ -1951,9 +1964,9 @@ checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" [[package]] name = "iroh" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3689cab508af9bcef7816c1201b403595ec6aa20e7d15e1f9683bb4be4a5b17" +checksum = "40ac5d8330439176254581b6db4bc6f1d947d7cc741fda4e04b96d758addf1db" dependencies = [ "backon", "blake3", @@ -1982,7 +1995,7 @@ dependencies = [ "pin-project", "portable-atomic", "portmapper", - "rand 0.10.3", + "rand 0.10.4", "reqwest 0.13.5", "rustc-hash", "rustls", @@ -2001,9 +2014,9 @@ dependencies = [ [[package]] name = "iroh-base" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b72366b16001af3a51574233df88ca6d62da0215807549a769e7de887da803" +checksum = "eff8f9146946feac461ef2e5fcf7b4b795eff44958ef6faa85cba3cecea62ab3" dependencies = [ "curve25519-dalek", "data-encoding", @@ -2012,17 +2025,18 @@ dependencies = [ "ed25519-dalek", "getrandom 0.4.3", "n0-error", - "rand 0.10.3", + "rand 0.10.4", "serde", + "tracing", "url", "zeroize", ] [[package]] name = "iroh-dns" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d0792dde1035a2b06ec06ed3cf6d01fcb1a494e6931b489e32073382048d" +checksum = "2cf4ac424ab7e13357c7bff7b6320b865e6ffc2320d726b58d1c8162f52a1406" dependencies = [ "arc-swap", "cfg_aliases", @@ -2032,7 +2046,7 @@ dependencies = [ "n0-error", "n0-future", "portable-atomic", - "rand 0.10.3", + "rand 0.10.4", "rustls", "simple-dns", "strum", @@ -2043,9 +2057,9 @@ dependencies = [ [[package]] name = "iroh-metrics" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ede55536349842337f7cdc63012ec33dc637945f3259c98a0763aac364cdf09" +checksum = "e136dab0f56d67ae1e8e4de75f84e271b6b2ccf0cdbed1be79936783247c1590" dependencies = [ "iroh-metrics-derive", "itoa", @@ -2070,9 +2084,9 @@ dependencies = [ [[package]] name = "iroh-relay" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5589e7c1475700686603a970275687f760df853bc6525c7eb1347aa31d7230" +checksum = "aef6e9c979c78b0dadf6a2aac4ff629c4ffb91ec34586275673524248dc72f55" dependencies = [ "blake3", "bytes", @@ -2087,7 +2101,7 @@ dependencies = [ "iroh-base", "iroh-dns", "iroh-metrics", - "lru", + "lru 0.19.1", "n0-error", "n0-future", "noq", @@ -2096,7 +2110,7 @@ dependencies = [ "percent-encoding", "pin-project", "postcard", - "rand 0.10.3", + "rand 0.10.4", "reqwest 0.13.5", "rustls", "rustls-pki-types", @@ -2116,7 +2130,7 @@ dependencies = [ [[package]] name = "irokle" version = "0.3.2" -source = "git+https://github.com/arunaengine/irokle.git?rev=209f881af3fa4b8ed16e2ca0a0315d663029329e#209f881af3fa4b8ed16e2ca0a0315d663029329e" +source = "git+https://github.com/arunaengine/irokle.git?rev=063d8be559f6f181257b22cca2d4cbde7d046969#063d8be559f6f181257b22cca2d4cbde7d046969" dependencies = [ "blake3", "bytes", @@ -2137,11 +2151,11 @@ dependencies = [ [[package]] name = "irokle-derive" version = "0.1.0" -source = "git+https://github.com/arunaengine/irokle.git?rev=209f881af3fa4b8ed16e2ca0a0315d663029329e#209f881af3fa4b8ed16e2ca0a0315d663029329e" +source = "git+https://github.com/arunaengine/irokle.git?rev=063d8be559f6f181257b22cca2d4cbde7d046969#063d8be559f6f181257b22cca2d4cbde7d046969" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2164,9 +2178,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" [[package]] name = "jni" @@ -2198,7 +2212,7 @@ dependencies = [ "simd_cesu8", "thiserror 2.0.21", "walkdir", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -2340,9 +2354,9 @@ checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c" [[package]] name = "loom" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" +checksum = "f1611ddbf89dc6ae42cfbd51fc207836140130257646eab8d6d2fb16577db2d2" dependencies = [ "cfg-if", "generator", @@ -2360,6 +2374,15 @@ dependencies = [ "hashbrown 0.17.1", ] +[[package]] +name = "lru" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83be4da409554841af087163ad187608824ad8ca8713d8e124c8e0f704a2f92f" +dependencies = [ + "hashbrown 0.17.1", +] + [[package]] name = "lru-slab" version = "0.1.3" @@ -2378,7 +2401,7 @@ dependencies = [ "enum_dispatch", "interval-heap", "log", - "lz4_flex 0.13.1", + "lz4_flex 0.13.2", "quick_cache", "rustc-hash", "self_cell", @@ -2390,18 +2413,18 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef0d4ed8669f8f8826eb00dc878084aa8f253506c4fd5e8f58f5bce72ddb97e" +checksum = "6a027efd2ad3c4dbb4123b5c018e3efbe7f6236da7c7612f122dad030f5d2de5" dependencies = [ "twox-hash", ] [[package]] name = "lz4_flex" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecbdfe44b1bd960b68170b417450a628c43f7cf56bb3c5317e61cb230ee7f226" +checksum = "f56455fff36934a9500d69062aec1c77037179b6f0669e4d5d6b72b84722d6a3" [[package]] name = "mac-addr" @@ -2460,9 +2483,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "1.2.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" +checksum = "20521a903f02b0a573cd6840e9d0a5a0cc043d361fe924092cd70f8556cc9c4a" dependencies = [ "libc", "wasi", @@ -2477,18 +2500,18 @@ checksum = "a8afc6df942f4c022d70c5725e18df1a705773870e5b7f96fde94ca0334ce77a" [[package]] name = "n0-dns-resolver" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535c99c9a786bee714155d2ee4fc2477405c2c43536e1bc6a51de09a0d1448f7" +checksum = "0381996935dc55768ae8b13e7db69d3a90f13afb51dde80f870484027968bcd2" dependencies = [ "derive_more", "ipconfig", "jni 0.22.4", - "lru", + "lru 0.18.5", "n0-error", "n0-future", "ndk-context", - "rand 0.10.3", + "rand 0.10.4", "reqwest 0.13.5", "rustc-hash", "rustls", @@ -2502,9 +2525,9 @@ dependencies = [ [[package]] name = "n0-error" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c59ea174675ce6bc196878851e5049e11b8b1f9af3ba87e4d6df8d828bb001" +checksum = "96c2215d16de3a55894583a539e6b151fb45236c3a6da45a18a40af73dc00636" dependencies = [ "n0-error-macros", "spez", @@ -2512,9 +2535,9 @@ dependencies = [ [[package]] name = "n0-error-macros" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4412346410d6616f3668c40e53c298e5320c7b856f7a960e5914e442601be79f" +checksum = "6217fd5f567ce1e53f324744c14fab04899861e397539c5f3cc08bd7c1dcd2de" dependencies = [ "proc-macro2", "quote", @@ -2562,9 +2585,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "netdev" -version = "0.45.1" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "096c44b66a9b09b99b4dd36b1c295ff3a492039ccecaf55466bd6ddcdba59968" +checksum = "98a4d13f8061600697d721c5fd45262aba533a7d4a7670e7c64fd02d68e4a9fb" dependencies = [ "block2", "dispatch2", @@ -2574,70 +2597,22 @@ dependencies = [ "libc", "mac-addr", "ndk-context", - "netlink-packet-core 0.8.2", - "netlink-packet-route 0.31.0", - "netlink-sys 0.8.8", - "objc2", + "netlink-packet-core", + "netlink-packet-route", + "netlink-sys", "objc2-core-foundation", - "objc2-core-wlan", - "objc2-foundation", "objc2-system-configuration", "once_cell", "plist", "windows-sys 0.61.2", ] -[[package]] -name = "netdev" -version = "0.46.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52c2584961c68f5a6e3356797344061f818c93b8acc9cd6d7e284795e563e" -dependencies = [ - "block2", - "dispatch2", - "dlopen2", - "ipnet", - "jni 0.21.1", - "libc", - "mac-addr", - "ndk-context", - "netlink-packet-core 0.9.0", - "netlink-packet-route 0.33.0", - "netlink-sys 0.9.0", - "objc2-core-foundation", - "objc2-system-configuration", - "once_cell", - "plist", - "windows-sys 0.61.2", -] - -[[package]] -name = "netlink-packet-core" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b897d7bd4f0af82e68d40d0344cf37e97f9c97ddf74a098de3e4da05e96ca395" -dependencies = [ - "paste", -] - [[package]] name = "netlink-packet-core" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d6e2daf9a8c2e21302714706860a0e6be02e03d17294ecc66b354ea7d4059dd" -[[package]] -name = "netlink-packet-route" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2288fcb784eb3defd5fb16f4c4160d5f477de192eac730f43e1d11c24d9a007" -dependencies = [ - "bitflags", - "libc", - "log", - "netlink-packet-core 0.8.2", -] - [[package]] name = "netlink-packet-route" version = "0.33.0" @@ -2647,38 +2622,25 @@ dependencies = [ "bitflags", "libc", "log", - "netlink-packet-core 0.9.0", + "netlink-packet-core", "zerocopy", ] [[package]] name = "netlink-proto" -version = "0.12.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93af8261786086024cd5e96e0a991dd65ced07bbf7c233a487bbc96b971d5539" +checksum = "97e03ae6247c6cdb499e8f14e98c72b83954d85822b687056e3a21150b438f2b" dependencies = [ "bytes", "futures-channel", "futures-util", "log", - "netlink-packet-core 0.8.2", - "netlink-sys 0.8.8", + "netlink-packet-core", + "netlink-sys", "thiserror 2.0.21", ] -[[package]] -name = "netlink-sys" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6c30ed10fa69cc491d491b85cc971f6bdeb8e7367b7cde2ee6cc878d583fae" -dependencies = [ - "bytes", - "futures-util", - "libc", - "log", - "tokio", -] - [[package]] name = "netlink-sys" version = "0.9.0" @@ -2686,19 +2648,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c99d38e00b420df49e940fe0826e667c3dad82ac68eb4c2bbf754c1c14a83a10" dependencies = [ "bytes", + "futures-util", "libc", "log", + "tokio", ] [[package]] name = "netwatch" -version = "0.19.3" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39da9cad5f23aa43401f09497d3b280e51b5feba115d9ffbf38ca35d6ff95e96" +checksum = "2acf7a1ca9205d7c1fc9a1595193a8cbaa7537b4a07dca93c6ae3de7c8d0e597" dependencies = [ "atomic-waker", "bytes", "cfg_aliases", + "chrono", "derive_more", "ipnet", "js-sys", @@ -2706,33 +2671,31 @@ dependencies = [ "n0-error", "n0-future", "n0-watcher", - "netdev 0.45.1", - "netdev 0.46.3", - "netlink-packet-core 0.8.2", - "netlink-packet-route 0.31.0", + "netdev", + "netlink-packet-core", + "netlink-packet-route", "netlink-proto", - "netlink-sys 0.8.8", + "netlink-sys", "noq-udp", "objc2-core-foundation", "objc2-system-configuration", "pin-project-lite", "serde", "socket2", - "time", "tokio", "tokio-util", "tracing", "web-sys", "windows", - "windows-result", + "windows-result 0.4.1", "wmi", ] [[package]] name = "nix" -version = "0.31.3" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" +checksum = "77730ed34f01f4990cb2ea67fec715ecebc6fab9a6396cf83c5529b13f581bdc" dependencies = [ "bitflags", "cfg-if", @@ -2752,9 +2715,9 @@ dependencies = [ [[package]] name = "noq" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6249a065adc1edbc1704a95436f38dd60476064dbc3b7c47cf279e02d1590eb5" +checksum = "0c2cf8bf3b78c2684a8485782c3357344416f264050f8d08a06c45c4642d87a2" dependencies = [ "bytes", "cfg_aliases", @@ -2774,9 +2737,9 @@ dependencies = [ [[package]] name = "noq-proto" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c01a35be3ed37558c8db69554419f24eff8a63599b54f711bbe3863ec727c47d" +checksum = "afb15c81d1f9b529d0c1f5095ee2e799eca9f361aa5f712424e758ce90f825d3" dependencies = [ "aes-gcm", "bytes", @@ -2785,7 +2748,7 @@ dependencies = [ "getrandom 0.4.3", "identity-hash", "lru-slab", - "rand 0.10.3", + "rand 0.10.4", "rand_pcg", "ring", "rustc-hash", @@ -2801,9 +2764,9 @@ dependencies = [ [[package]] name = "noq-udp" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d0160422832eea1cc11c34be04ee6d5a046452b0b46cfb14695d55a1f24c954" +checksum = "716df6621d528211d75608903c0dd54bee78745444cdcbb791bcfbc55717a29f" dependencies = [ "cfg_aliases", "libc", @@ -2880,39 +2843,12 @@ dependencies = [ "objc2", ] -[[package]] -name = "objc2-core-wlan" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e34919aba0d701380d911702455038a8a3587467fe0141d6a71501e7ffe48" -dependencies = [ - "bitflags", - "objc2", - "objc2-core-foundation", - "objc2-foundation", - "objc2-security", - "objc2-security-foundation", -] - [[package]] name = "objc2-encode" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" -[[package]] -name = "objc2-foundation" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" -dependencies = [ - "bitflags", - "block2", - "libc", - "objc2", - "objc2-core-foundation", -] - [[package]] name = "objc2-security" version = "0.3.2" @@ -2924,16 +2860,6 @@ dependencies = [ "objc2-core-foundation", ] -[[package]] -name = "objc2-security-foundation" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef76382e9cedd18123099f17638715cc3d81dba3637d4c0d39ab69df2ef345a5" -dependencies = [ - "objc2", - "objc2-foundation", -] - [[package]] name = "objc2-system-configuration" version = "0.3.2" @@ -2948,6 +2874,15 @@ dependencies = [ "objc2-security", ] +[[package]] +name = "object" +version = "0.39.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e5a6c098c7a3b6547378093f5cc30bc54fd361ce711e05293a5cc589562739b" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.21.4" @@ -3199,7 +3134,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -3275,29 +3210,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.13" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924" +checksum = "a6c2123f4708bbd422630a6dae7c03f678b1ce1f1c99e4c4b3beac69c8174cc9" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.13" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" +checksum = "358938fd6df944c1e44bb328b60fb275f13c804aac47ba26a1165d45a3f87756" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.10", ] [[package]] name = "pin-project-lite" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" +checksum = "c938015719552d665fd0553b90d96cd7ff58e83e4c061ca99e6bb78865a72752" [[package]] name = "pkcs8" @@ -3317,9 +3252,9 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "plist" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327a4cb2ad49dc48adfdc9da89e22c64d488b508c67a044d71ba729e4521a285" +checksum = "d86a77b7d9cdebd9643c180c158748db7d894b24a3935ed4b5843e698ae086eb" dependencies = [ "base64 0.23.1", "indexmap", @@ -3379,11 +3314,10 @@ dependencies = [ [[package]] name = "portmapper" -version = "0.19.3" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca97242f016e090a25330613bc2382aab65eb22f9149dbe84d8f8e711d49a530" +checksum = "d36ce759df600731dd2511cd2d640bd551086b2f7b68bceb9bbcfd8c7ff86053" dependencies = [ - "base64 0.22.1", "bytes", "derive_more", "hyper-util", @@ -3394,14 +3328,12 @@ dependencies = [ "n0-future", "netwatch", "num_enum", - "rand 0.10.3", + "rand 0.10.4", "serde", "smallvec", "socket2", - "time", "tokio", "tokio-util", - "tower-layer", "tracing", "url", ] @@ -3457,9 +3389,9 @@ dependencies = [ [[package]] name = "prefixmap" -version = "0.3.25" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da048db841ac92680671198e3e32b1a858393f00239708a3d74125025904ead" +checksum = "91190fa863a4803f4f9b2022ddf9271619793e59c30105a40fd45615eead9987" dependencies = [ "colored", "indexmap", @@ -3476,7 +3408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bfe0f4c752e450fc2faf62654f1c134747922825d5b04ca717b8874f41a40c0" dependencies = [ "proc-macro2", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -3531,7 +3463,7 @@ dependencies = [ "chacha20", "core_detect", "num-traits", - "rand 0.10.3", + "rand 0.10.4", "rand_xorshift", "regex-syntax", "rusty-fork", @@ -3539,6 +3471,16 @@ dependencies = [ "unarray", ] +[[package]] +name = "psm" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd034599e63b970727f70d79e02d62390a4a84f7c6b827c27c46d5ac3fa622" +dependencies = [ + "ar_archive_writer", + "cc", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -3602,7 +3544,7 @@ dependencies = [ "bytes", "getrandom 0.4.3", "lru-slab", - "rand 0.10.3", + "rand 0.10.4", "rand_pcg", "ring", "rustc-hash", @@ -3673,9 +3615,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" +checksum = "8f6fa277c67e6ea590466f04c3fe82cb509f0864fe470643e5570de9514a9b11" dependencies = [ "chacha20", "getrandom 0.4.3", @@ -3728,9 +3670,9 @@ checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rand_pcg" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" +checksum = "eb95882a1e14462c69aea9984bb261293ccfe6022ef8de0eda18bd5afb0052df" dependencies = [ "rand_core 0.10.1", ] @@ -3783,11 +3725,31 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "ref-cast" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e440fb4e4b4147295338efb76001ab9e4efc0e5839df2c47fc5ac2381d365c3" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.10", +] + [[package]] name = "regex" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" +checksum = "9807af0e638c12e753aa1b4e601791bf2a8f71274023c8bbeec12fc149950857" dependencies = [ "aho-corasick", "memchr", @@ -3797,9 +3759,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" +checksum = "41d60ef07df457506a0a1a2073112eb4aae5733dbd2813c3da77d1b0fd441158" dependencies = [ "aho-corasick", "memchr", @@ -3808,9 +3770,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" +checksum = "d902046e6a28a1e4c3cab97258a0ce11e994903f01c2d97a9447a0b3df85f4f6" [[package]] name = "reqwest" @@ -3917,7 +3879,7 @@ dependencies = [ "log", "oxrdf", "oxrdfio", - "rand 0.10.3", + "rand 0.10.4", "reqwest 0.13.5", "serde", "serde_json", @@ -3930,9 +3892,9 @@ dependencies = [ [[package]] name = "rudof_config" -version = "0.3.37" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f976d3e928df29d7b0eaa4838a939f05064d9069aa031edd1838040d7a89c3d" +checksum = "55f7001bc22395b6e54792167272c8adbca709fbfbaecf79298a11252840fe94" dependencies = [ "dirs", "serde", @@ -3942,9 +3904,9 @@ dependencies = [ [[package]] name = "rudof_iri" -version = "0.3.25" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930abd3dcd341e45fbd39b3ab147ed6e3172a1334a4871df37ea4bd6a7974603" +checksum = "04b61276341a817ec2013b573d0ef95a149fefa5b8d9f89d7f53f25bae96adb6" dependencies = [ "getrandom 0.3.4", "getrandom 0.4.3", @@ -3960,9 +3922,9 @@ dependencies = [ [[package]] name = "rudof_rdf" -version = "0.3.25" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd163af2e0c8101014962b16d7e8010aa1fac7c5e2c09c48c8cc8a99ed52e76a" +checksum = "0fc797e48a3e37ea40ef3ccbdbbdcbddeb4365bb3afd4e23840f541b585d0c27" dependencies = [ "colored", "const_format", @@ -3986,6 +3948,7 @@ dependencies = [ "rudof_iri", "rudof_viz", "rust_decimal", + "schemars", "serde", "serde_json", "tabled", @@ -3997,20 +3960,35 @@ dependencies = [ "url", ] +[[package]] +name = "rudof_rdf_sink" +version = "0.3.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "328041f50dce692137564810909103f30a08d0d0c1624aac22065583eed693c2" +dependencies = [ + "oxrdf", + "oxttl", + "prefixmap", + "rudof_iri", + "rudof_rdf", + "thiserror 2.0.21", + "tracing", +] + [[package]] name = "rudof_typing" -version = "0.3.37" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9dfeaa8e9d012bf19137de215fb6b35d1795bbf49afe3ee7d588521294ff4a" +checksum = "067b027c4211abeeffc1183f10e9ed166e3598b3e4fb98765380339c8ed5d8ea" dependencies = [ "either", ] [[package]] name = "rudof_viz" -version = "0.3.37" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63568025097d60e3264e5c72be8e9eecf8254a165f06fa09519eb8aeaec73dd9" +checksum = "5ff78592c717b7ed11efe277430cf478528a20a6f35bd1c57da774976508c10a" dependencies = [ "serde", "tempfile", @@ -4091,9 +4069,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.15.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" +checksum = "102f35f7de7b06d8c61f1cff6592f5253e0dea431c74867aad5dfd70f44663fb" dependencies = [ "web-time", "zeroize", @@ -4128,9 +4106,9 @@ checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" [[package]] name = "rustls-webpki" -version = "0.103.16" +version = "0.103.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" +checksum = "e3a0760a887c14823fca5a1c970b01d47c328c696c0c64829d1df50e8f853fd5" dependencies = [ "ring", "rustls-pki-types", @@ -4185,6 +4163,31 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "schemars" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab508826f74a77ca9d5aba6ff19b522583ee3eaf28a19384ff3d0e5835fadf6e" +dependencies = [ + "dyn-clone", + "ref-cast", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1c3a92094fa7d61aa124645844facb6b554dfc797136d0f5fd1f890e2bffc69" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 3.0.10", +] + [[package]] name = "scoped-tls" version = "1.0.1" @@ -4290,7 +4293,18 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", +] + +[[package]] +name = "serde_derive_internals" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f852137cce035d6a4df67ccce505ff6b3e9fd3a10e3e52b24dc71e650bb1a9bd" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.10", ] [[package]] @@ -4308,9 +4322,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c" +checksum = "9c187e0a369471c550af028cba56d4f4fa2a489ad28151ae95a4d340a2a8b782" dependencies = [ "serde_core", ] @@ -4378,24 +4392,28 @@ dependencies = [ [[package]] name = "shacl" -version = "0.3.25" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c3d20a121e691188b4da6ed8df0bb9b04056db494d8073f17e9b374b4959621" +checksum = "c9b9fb0f83cd728b9148b1d27362089effa7a1840d6bd3a70926732d584e6fec" dependencies = [ "anyhow", "dashmap", "either", "indoc", "itertools 0.14.0", + "oxrdf", "petgraph", "prefixmap", "rayon", "rudof_config", "rudof_iri", "rudof_rdf", + "rudof_rdf_sink", "rudof_typing", "rust_decimal", + "schemars", "serde", + "stacker", "thiserror 2.0.21", "toml", "tracing", @@ -4459,9 +4477,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple-dns" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6f884fa9a8d48101774bfbd3aeb81e968dd22cffd19a372da69f183db22c1a" +checksum = "8aea2b78df6bbe38fb98d2c8140ada65fb63a314246a0c38626140dd21c69ff7" dependencies = [ "bitflags", ] @@ -4498,9 +4516,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.16.4" +version = "1.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8" +checksum = "3244542535d5de959d90ec55d1b5ff0fd2bb7b1310223907d5f11932847f7b59" [[package]] name = "socket2" @@ -4621,6 +4639,19 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +[[package]] +name = "stacker" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707f49d46706bacf8a2b00d51dace3f9de527c13eec3778f570c411f89e69967" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "windows-sys 0.61.2", +] + [[package]] name = "strsim" version = "0.11.1" @@ -4667,9 +4698,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.9" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" +checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79" dependencies = [ "proc-macro2", "quote", @@ -4693,7 +4724,7 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -4768,8 +4799,8 @@ dependencies = [ "itertools 0.14.0", "levenshtein_automata", "log", - "lru", - "lz4_flex 0.14.0", + "lru 0.18.5", + "lz4_flex 0.14.2", "measure_time", "memmap2", "once_cell", @@ -4954,7 +4985,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -5048,7 +5079,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -5101,7 +5132,7 @@ dependencies = [ "getrandom 0.4.3", "http", "httparse", - "rand 0.10.3", + "rand 0.10.4", "ring", "rustls-pki-types", "sha1_smol", @@ -5137,39 +5168,39 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.1.2+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053" +checksum = "173f25c883cd2176a2d8212155638c0a60d484a9d84546d270866f40f56b6e49" dependencies = [ "serde_core", ] [[package]] name = "toml_edit" -version = "0.25.17+spec-1.1.0" +version = "0.25.20+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3641d5bbb5349a79e1020a242d251efbc546ad8048d133958323ce9c40a9c9c" +checksum = "e76360e201d6dbd6583e17795ba71a88f47365a9139c8450a7979c32303b8e73" dependencies = [ "indexmap", - "toml_datetime 1.1.2+spec-1.1.0", + "toml_datetime 1.1.3+spec-1.1.0", "toml_parser", - "winnow 1.0.4", + "winnow 1.0.5", ] [[package]] name = "toml_parser" -version = "1.1.5+spec-1.1.0" +version = "1.1.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c" +checksum = "e6769c452d71ba30696c6b37770c439a9cc9110f47f7d5cdbeda79840ef5ea31" dependencies = [ - "winnow 1.0.4", + "winnow 1.0.5", ] [[package]] name = "toml_writer" -version = "1.1.3+spec-1.1.0" +version = "1.2.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770" +checksum = "009dbb7700f11c55ef83aebbe4c0e9cf1f1ac0844bd8d6f00dc38f302026e13a" [[package]] name = "tower" @@ -5329,7 +5360,7 @@ checksum = "f153acc4e99a5f2a5aefa09fb078be54e26271b2813f6041200b224c098d8328" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -5386,9 +5417,9 @@ checksum = "e497bb1f828cc9fb236722c2eaa100dcf201563f38f4da6252357a59037adf31" [[package]] name = "url" -version = "2.5.8" +version = "2.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" +checksum = "f00cd2407bb42c0ef17be88d4cf020f5cceffd121665bac9b8b9493a369b3b1a" dependencies = [ "form_urlencoded", "idna", @@ -5420,9 +5451,9 @@ checksum = "3a3b425286980a367278453f3b6d28cdcb134b574e5a35824a6ff5eebad50bb6" [[package]] name = "uuid" -version = "1.29.0" +version = "1.29.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514" +checksum = "3c14b15dffa2f4bd712103e857140aa04a4f2ff6e955c77d7eb8e53ee02a3b64" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -5469,9 +5500,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +checksum = "b42e295b7452c4604982280d8586001fcad9b8b201cac67bca9771e7a7475403" dependencies = [ "same-file", "winapi-util", @@ -5544,7 +5575,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "wasm-bindgen-shared", ] @@ -5592,18 +5623,18 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49d0e65abc00c142e8f9428da991da9f1a250c39be97459901eb12b9b49f62a" +checksum = "293198dcebfb821155b5092ab94b5a82ff180eddd7241df3bd6e66a4ffd1a585" dependencies = [ "rustls-pki-types", ] [[package]] name = "webpki-roots" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171" +checksum = "7265c9301c16a8711c992c2d8da90ee77ef54b1ed51482d6dfeb00dc756b1297" dependencies = [ "rustls-pki-types", ] @@ -5652,7 +5683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" dependencies = [ "windows-collections", - "windows-core", + "windows-core 0.62.2", "windows-future", "windows-numerics", ] @@ -5663,7 +5694,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" dependencies = [ - "windows-core", + "windows-core 0.62.2", ] [[package]] @@ -5672,11 +5703,24 @@ version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement", - "windows-interface", - "windows-link", - "windows-result", - "windows-strings", + "windows-implement 0.60.2", + "windows-interface 0.59.3", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-core" +version = "0.100.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "803590c6856f51d15fa2e9fabe4f4703122c8737f72ef2741b4ac09d4c2192f5" +dependencies = [ + "windows-implement 0.100.0", + "windows-interface 0.100.0", + "windows-link 0.100.0", + "windows-result 0.100.0", + "windows-strings 0.100.0", ] [[package]] @@ -5685,8 +5729,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" dependencies = [ - "windows-core", - "windows-link", + "windows-core 0.62.2", + "windows-link 0.2.1", "windows-threading", ] @@ -5701,6 +5745,17 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "windows-implement" +version = "0.100.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc1bc82e5a1b1a4d7255861b07881a0407b552f50a4d8543c0c7276fa96f6e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "windows-interface" version = "0.59.3" @@ -5712,20 +5767,37 @@ dependencies = [ "syn 2.0.119", ] +[[package]] +name = "windows-interface" +version = "0.100.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3f7005c3b757b9b82c2f40c0e71094ff1080adddaf3e8b6ce99b545d3c48796" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-link" +version = "0.100.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b39de7c7fe78858b0144c50c3fc000bab3be17d5e9b85b1053871693c7f7415" + [[package]] name = "windows-numerics" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" dependencies = [ - "windows-core", - "windows-link", + "windows-core 0.62.2", + "windows-link 0.2.1", ] [[package]] @@ -5734,9 +5806,9 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" dependencies = [ - "windows-link", - "windows-result", - "windows-strings", + "windows-link 0.2.1", + "windows-result 0.4.1", + "windows-strings 0.5.1", ] [[package]] @@ -5745,7 +5817,16 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link", + "windows-link 0.2.1", +] + +[[package]] +name = "windows-result" +version = "0.100.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44873a1ef61c85d5e2991db91fe656cfcf0731097e00dff1ac860f1cb3b752a0" +dependencies = [ + "windows-link 0.100.0", ] [[package]] @@ -5754,7 +5835,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link", + "windows-link 0.2.1", +] + +[[package]] +name = "windows-strings" +version = "0.100.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a70b590c684f1d2854f74999896f7c0558f1bdde62f599088599e20ea1d2f60" +dependencies = [ + "windows-link 0.100.0", ] [[package]] @@ -5790,7 +5880,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -5830,7 +5920,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -5931,9 +6021,9 @@ checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" [[package]] name = "winnow" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" +checksum = "8c3b93199df0ab874cdf0c6a94f0a0dc3423fe41f1cafb62b8bd7b1deb277aef" dependencies = [ "memchr", ] @@ -5956,7 +6046,7 @@ dependencies = [ "serde", "thiserror 2.0.21", "windows", - "windows-core", + "windows-core 0.62.2", ] [[package]] @@ -6001,9 +6091,9 @@ dependencies = [ [[package]] name = "xxhash-rust" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550a2b930b62486a393c52d5c3b84bff264b28aa437ed64694d31e93b1757af7" +checksum = "40de123dbb523ebcc00d61ec01840ad192578afc378d859f3429caa38308fad5" [[package]] name = "yoke" @@ -6024,24 +6114,24 @@ checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.63" +version = "0.8.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8" +checksum = "ed43f3060383c64b000f3c630550aebdfa9d3b76d48de32390483dd2cc7e0865" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.63" +version = "0.8.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f" +checksum = "a5cbd820fe3e35fb38c83b6dc7e6b1618bc46e0cd10073ae94e8d52dc468d8b9" dependencies = [ "proc-macro2", "quote", @@ -6065,15 +6155,15 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "synstructure", ] [[package]] name = "zeroize" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" +checksum = "85ccff8a4805aba1eaa4cd4afcd49f7557dd2cf5fd79ffc37f8959466effc5aa" dependencies = [ "zeroize_derive", ] @@ -6119,15 +6209,16 @@ checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] name = "zip" -version = "9.3.0" +version = "9.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaeb7f16d2605b49aef586996ded29e65642fab7259a3077e537351df6d80426" +checksum = "a9534624d547e3f516ecde0ed9a70d37788f01d340efcfdd03bf3ea8e163c1d0" dependencies = [ + "constant_time_eq 0.6.1", "crc32fast", "flate2", "getrandom 0.4.3", @@ -6137,6 +6228,7 @@ dependencies = [ "nix", "typed-path", "windows-sys 0.61.2", + "zeroize", "zopfli", ] @@ -6166,27 +6258,27 @@ dependencies = [ [[package]] name = "zstd" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3ae9bf90af6e40197bef767eeefc46ad6397420fe873830bd85e5fbbfb3c70" +checksum = "ad5020ab8f27bfc0024ad0a07aed6bf022a16208f479686fbed4fdd0c85eb0b3" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "8.2.0" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded520f16b29e1a9b771c722221b2b0a0398c2316d9bb3c42b458a5414d7434b" +checksum = "5a9ea9cc2576c2fcc104e9cec04f46e3ede564f4fbc206831e4ef7e859a4140d" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.1.2+zstd.1.5.7" +version = "2.1.3+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "481ada9c543b2323cbb7bbdbb5249177fbf0188ed959ed2c15e4b22421c84ed3" +checksum = "f729a06d0257428fd9d997ac8db7e1407bd0262ab016b085b36bc52957c0052d" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index da1939c..838894b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ shacl-core = [ blake3 = "=1.8.7" chrono = { version = "0.4.45", features = ["serde"] } fjall = "3.1.13" -irokle = { git = "https://github.com/arunaengine/irokle.git", rev = "209f881af3fa4b8ed16e2ca0a0315d663029329e", features = [ +irokle = { git = "https://github.com/arunaengine/irokle.git", rev = "063d8be559f6f181257b22cca2d4cbde7d046969", features = [ "fjall", ] } oxrdf = { version = "0.3.5", features = ["rdf-12", "serde"] } @@ -47,10 +47,10 @@ postcard = { version = "1.1.3", features = ["alloc"] } rocraters = { package = "ro-crate-rs", git = "https://github.com/arunaengine/ro-crate-rs.git", rev = "9cbb366c7569e79220a2c047a54309d596f8d208", features = [ "rdf", ] } -regex = { version = "1.13.1", optional = true } -shacl = { version = "=0.3.25", default-features = false, optional = true } -rudof_rdf = { version = "=0.3.25", default-features = false, optional = true } -rudof_iri = { version = "=0.3.25", default-features = false, optional = true } +regex = { version = "1.13.2", optional = true } +shacl = { version = "=0.3.39", default-features = false, optional = true } +rudof_rdf = { version = "=0.3.39", default-features = false, optional = true } +rudof_iri = { version = "=0.3.39", default-features = false, optional = true } serde_json = "1.0.154" spargebra = { version = "0.4.8", features = ["sparql-12"] } spareval = { version = "0.2.9", features = ["sep-0006", "sparql-12"] } @@ -59,7 +59,7 @@ globset = "0.4.21" serde = { version = "1.0.229", features = ["derive"] } thiserror = "2.0.21" tracing = "0.1.44" -uuid = { version = "1.29.0", features = ["v4", "serde"] } +uuid = { version = "1.29.3", features = ["v4", "serde"] } rayon = "1.12.0" [dev-dependencies] @@ -67,7 +67,7 @@ anyhow = "1.0.104" criterion = "0.8.2" proptest = "1.12.0" tempfile = "3.27.0" -iroh = "1.4.1" +iroh = "1.5.0" oxigraph = { version = "=0.5.13", default-features = false, features = ["rdf-12"] } tokio = { version = "1.54.1", features = ["macros", "rt-multi-thread"] } diff --git a/src/internal/rdf_read.rs b/src/internal/rdf_read.rs index 3e9bec2..1531c02 100644 --- a/src/internal/rdf_read.rs +++ b/src/internal/rdf_read.rs @@ -2270,7 +2270,8 @@ mod tests { .graph_diagnostics(&graph) .unwrap() .orphaned_entities - .contains(&"urn:test:orphan-filter:orphan".to_string()) + .iter() + .any(|entity| entity == "urn:test:orphan-filter:orphan") ); let view = StoreReadView::new(&store); diff --git a/src/internal/shacl/compile.rs b/src/internal/shacl/compile.rs index eaed050..ee20481 100644 --- a/src/internal/shacl/compile.rs +++ b/src/internal/shacl/compile.rs @@ -15,8 +15,9 @@ use rudof_iri::IriS; use rudof_rdf::rdf_core::RDFFormat; use rudof_rdf::rdf_core::SHACLPath; use rudof_rdf::rdf_core::term::Object; +use rudof_rdf::rdf_core::term::literal::ConcreteLiteral; use rudof_rdf::rdf_impl::{OxigraphInMemory, ReaderMode}; -use shacl::ir::{IRComponent, IRSchema, IRShape, ShapeLabelIdx}; +use shacl::ir::{IRComponent, IRNodeExpr, IRSchema, IRShape, IRTarget, ShapeLabelIdx}; use shacl::rdf::ShaclParser; use shacl::types::{NodeKind, Severity, Target}; @@ -1739,6 +1740,7 @@ fn compile_model( .into()); } let messages = compile_messages(shape); + let deactivated = compile_deactivated(&label.0, shape.deactivated())?; let dependencies = dependencies::analyze(&targets, path.as_ref(), &constraints, &property_shapes); shapes.push(CompiledShape { @@ -1754,7 +1756,7 @@ fn compile_model( property_shapes: property_shapes.into_boxed_slice(), severity: compile_severity(shape.severity()), messages, - deactivated: shape.deactivated(), + deactivated, dependencies, }); } @@ -1766,9 +1768,32 @@ fn compile_model( }) } -fn compile_target(shape: &EncodedTerm, target: &Target) -> Result { +/// Whether a shape is deactivated: `sh:deactivated` absent, or a constant boolean. Any other node +/// expression is unsupported and fails explicitly instead of looking active or inactive. +fn compile_deactivated(shape: &str, deactivated: Option<&IRNodeExpr>) -> Result { + let Some(expression) = deactivated else { + return Ok(false); + }; + match expression.as_constant() { + Some(Object::Literal(ConcreteLiteral::BooleanLiteral(deactivated))) => Ok(deactivated), + _ => Err(ShaclError::UnsupportedComponent { + shape: shape.to_owned(), + component: "http://www.w3.org/ns/shacl#deactivated".to_owned(), + } + .into()), + } +} + +fn compile_target(shape: &EncodedTerm, target: &IRTarget) -> Result { match target { - Target::Node(node) => Ok(TargetPlan::Node(encoded_object(node)?)), + Target::Node(node) => match node.as_constant() { + Some(node) => Ok(TargetPlan::Node(encoded_object(&node)?)), + None => Err(ShaclError::UnsupportedComponent { + shape: shape.0.clone(), + component: "http://www.w3.org/ns/shacl#targetNode".to_owned(), + } + .into()), + }, Target::Class(class) => Ok(TargetPlan::Class(encoded_object(class)?)), Target::SubjectsOf(predicate) => Ok(TargetPlan::SubjectsOf(encoded_iri(predicate))), Target::ObjectsOf(predicate) => Ok(TargetPlan::ObjectsOf(encoded_iri(predicate))), diff --git a/tests/merge_api.rs b/tests/merge_api.rs index 454532e..c6e0895 100644 --- a/tests/merge_api.rs +++ b/tests/merge_api.rs @@ -309,7 +309,8 @@ fn plan_patch_merges() { ); assert!( objects_for(&planner, &graph, vocab::schema_name().as_str()) - .contains(&"\"renamed.raw\"".to_string()) + .iter() + .any(|name| name == "\"renamed.raw\"") ); } @@ -359,9 +360,9 @@ fn plan_remove_merges() { assert_eq!(parts.len(), 1); assert!(parts[0].contains("file-1.raw"), "{parts:?}"); let names = objects_for(&planner, &graph, vocab::schema_name().as_str()); - assert!(names.contains(&"\"file-1.raw\"".to_string())); - assert!(!names.contains(&"\"file-0.raw\"".to_string())); - assert!(names.contains(&"\"Merge Dataset\"".to_string())); + assert!(names.iter().any(|name| name == "\"file-1.raw\"")); + assert!(!names.iter().any(|name| name == "\"file-0.raw\"")); + assert!(names.iter().any(|name| name == "\"Merge Dataset\"")); let again = planner.plan_remove_data(&AllowAllAuthorizer, &remove("./data/file-0.raw")); assert!(again.is_err()); } diff --git a/tests/rocrate/main.rs b/tests/rocrate/main.rs index 3bdb788..4689013 100644 --- a/tests/rocrate/main.rs +++ b/tests/rocrate/main.rs @@ -2775,11 +2775,13 @@ mod tests { let summary = parsed(&summary_json); assert_entities_linked(&summary, &graph); assert!( - graph_ids(&summary).contains(&"./profile/mode.json".to_string()), + graph_ids(&summary) + .iter() + .any(|id| id == "./profile/mode.json"), "the fixture must put a data entity in the summary, or this proves nothing" ); assert!( - !graph_ids(&summary).contains(&"./data/one.txt".to_string()), + !graph_ids(&summary).iter().any(|id| id == "./data/one.txt"), "ordinary root hasPart files stay out of summary exports" ); @@ -2809,7 +2811,8 @@ mod tests { ); assert!( graph_ids(&parsed(&mgr.export_jsonld_summary(&reimported).unwrap())) - .contains(&"./profile/mode.json".to_string()), + .iter() + .any(|id| id == "./profile/mode.json"), "the artifact must survive the summary round trip" ); }