diff --git a/Cargo.lock b/Cargo.lock index c7f6eba..08f2014 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,9 +25,9 @@ checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" [[package]] name = "alloc-stdlib" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195" dependencies = [ "alloc-no-stdlib", ] @@ -97,11 +97,17 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "anyhow" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" + [[package]] name = "arrayvec" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" [[package]] name = "autocfg" @@ -150,9 +156,9 @@ checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" [[package]] name = "brotli" -version = "8.0.3" +version = "8.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8119e4516436f5708bbc474a9d395bf12f1b5395e93a92a56e647ac3388c8610" +checksum = "5cc91aac060a7a1e25823bdccbfb6af1875b88f17c6daac97894eed8207166b3" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -161,14 +167,25 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "5.0.1" +version = "5.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924" +checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] +[[package]] +name = "bstr" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79" +dependencies = [ + "memchr", + "regex-automata", + "serde_core", +] + [[package]] name = "buf-trait" version = "0.4.1" @@ -192,9 +209,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.11.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "byteyarn" @@ -216,9 +233,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.63" +version = "1.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f" +checksum = "e17dd265a7d0f31ef544e1b20e03add05d3b45b491b633b10d67145d2acc1a38" dependencies = [ "find-msvc-tools", "shlex 2.0.1", @@ -336,6 +353,31 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17" + [[package]] name = "crossterm" version = "0.29.0" @@ -365,9 +407,9 @@ dependencies = [ [[package]] name = "dbus" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b942602992bb7acfd1f51c49811c58a610ef9181b6e66f3e519d79b540a3bf73" +checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e" dependencies = [ "libc", "libdbus-sys", @@ -418,6 +460,16 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "dispatch2" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" +dependencies = [ + "bitflags", + "objc2", +] + [[package]] name = "displaydoc" version = "0.2.6" @@ -619,6 +671,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "humantime" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15cdd26707701c53297e2fa6afb323d55fbc1d0810c3aec078ae3ef0424c3c15" + [[package]] name = "iana-time-zone" version = "0.1.65" @@ -717,9 +775,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc" dependencies = [ "either", ] @@ -732,21 +790,20 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "js-sys" -version = "0.3.99" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11" +checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" dependencies = [ "cfg-if", "futures-util", - "once_cell", "wasm-bindgen", ] [[package]] name = "lean_string" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385ba1b8a25159d816b62eea948cf3c6b38c5050c92ca901c570deead00316e5" +checksum = "dff9d7a64297827f9ef2cc8a111ca1d87bead398b7f9fe76ba0eb9f50d175e8d" dependencies = [ "castaway", "itoa", @@ -792,9 +849,9 @@ dependencies = [ [[package]] name = "libredox" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" +checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652" dependencies = [ "libc", ] @@ -822,15 +879,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" +checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "lru" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9" +checksum = "0b6180140927ee907000b0aa540091f6ea512ead4447c92b8fc35bc72788a5a6" dependencies = [ "hashbrown", ] @@ -853,9 +910,9 @@ checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b" [[package]] name = "memchr" -version = "2.8.1" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "miette" @@ -955,9 +1012,9 @@ dependencies = [ [[package]] name = "nu-derive-value" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004a7d24d151037d1df4d5372e1910f775f32403a3d828031d4feba6fd916149" +checksum = "be1341b1e7a6f84f5e6ab003a49efc8a90e480c74cc18c5c90b5461b2fbc17f8" dependencies = [ "heck", "proc-macro-error2", @@ -968,9 +1025,9 @@ dependencies = [ [[package]] name = "nu-engine" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4e7c93ccfce77a2e29fffdf0662d83dfc3773c8fdd98e0397a422c7cfd4a79" +checksum = "7dabd15b72caf0a2b226251703b5126a7429d10198f643ace850692f3fd24c1e" dependencies = [ "fancy-regex", "log", @@ -983,25 +1040,31 @@ dependencies = [ [[package]] name = "nu-experimental" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d0b987b882ac91d5e306afa0845f2601bb8fc483ee8e59d766842571c8302" +checksum = "d77602508caba97599c3f2a5a58f5b532fab15a5b2c74bdeb26c1f151fe842c5" dependencies = [ - "itertools 0.14.0", + "itertools 0.15.0", "thiserror 2.0.18", ] [[package]] name = "nu-glob" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c10023a62f5c90f22b4977878b7a25fac8dc2091639ddee2e3b7b9a47d52ff" +checksum = "0b31d6cdcb4fa6d0513fc0d82a174967b6aeb822fbfd4f1b5ce8519fe5f67c95" +dependencies = [ + "anyhow", + "log", + "nu-experimental", + "rayon", +] [[package]] name = "nu-path" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d64ea11090ecdc8f2ee2eb2d383ae2481ac2e35040c59d36fde4c0d948daf1" +checksum = "4fa6e1b44c9f9df11f7479b1db28a957c6ccc4414589f8712f3bad3842ade840" dependencies = [ "dirs", "omnipath", @@ -1011,9 +1074,9 @@ dependencies = [ [[package]] name = "nu-plugin" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5742f642c5ade25856b25c9cbc36e73ab5bcd70415c8a4c0b84c560c6e25af" +checksum = "e854feab2d721d3123e4b12b58134d965658045cb9faba3d03a321bec9ce25a4" dependencies = [ "log", "nix", @@ -1027,9 +1090,9 @@ dependencies = [ [[package]] name = "nu-plugin-core" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc6af4b040913e8d04dc37c95972361f34dc942b8e2052cc1c4f396e0109616" +checksum = "66f121197a0a06a5231bc023bdebefd7fd58e034b86f72c46e9ccd038fee3054" dependencies = [ "interprocess", "log", @@ -1044,9 +1107,9 @@ dependencies = [ [[package]] name = "nu-plugin-protocol" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "013062a31e9305308e59d2cb7b09b9ac39aae866aa880d35026aaf77109f1ee3" +checksum = "db1deef5bf869a03a80d668e8a474a734edafc21c3a8e91e2f7f0fd45042fc4f" dependencies = [ "nu-protocol", "nu-utils", @@ -1058,11 +1121,12 @@ dependencies = [ [[package]] name = "nu-protocol" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0c58828aa058bdf74dc69ae7e882815ae5612f88a5c876f37f2d680fa86e3f" +checksum = "4f44d325b0859551a05341666d94ab5b2173803960b044d7600c25425d629183" dependencies = [ "brotli", + "bstr", "bytes", "chrono", "chrono-humanize", @@ -1071,6 +1135,7 @@ dependencies = [ "dirs-sys", "fancy-regex", "heck", + "humantime", "indexmap", "log", "lru", @@ -1086,6 +1151,7 @@ dependencies = [ "num-format", "os_pipe", "rmp-serde", + "semver", "serde", "serde_json", "strum", @@ -1095,16 +1161,17 @@ dependencies = [ "web-time", "windows", "windows-sys", + "winnow", ] [[package]] name = "nu-system" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357a3b782dcb203ec8e05d0176e60b9bcb956c5d98f094cd3c3a117bc98b928d" +checksum = "5a41ebfa02bc180544f8c895b715077b3e77c642e13a3ae7644f887b077fae99" dependencies = [ "chrono", - "itertools 0.14.0", + "itertools 0.15.0", "libc", "libproc", "log", @@ -1121,9 +1188,9 @@ dependencies = [ [[package]] name = "nu-utils" -version = "0.113.1" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec685be6fcc963735a023948a38e7e39e03a32fedc09649c30019ce8f85fbfc8" +checksum = "322ee47417187b708bf89450a69fcddb8058559268d6a5e0cf0dc4afe7ba71aa" dependencies = [ "byteyarn", "crossterm", @@ -1147,7 +1214,7 @@ dependencies = [ [[package]] name = "nu_plugin_dbus" -version = "0.23.0" +version = "0.24.0" dependencies = [ "dbus", "nu-plugin", @@ -1175,6 +1242,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "objc2" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" +dependencies = [ + "objc2-encode", +] + [[package]] name = "objc2-core-foundation" version = "0.3.2" @@ -1182,6 +1258,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ "bitflags", + "dispatch2", + "objc2", +] + +[[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", + "objc2", ] [[package]] @@ -1194,6 +1288,17 @@ dependencies = [ "objc2-core-foundation", ] +[[package]] +name = "objc2-open-directory" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb82bed227edf5201dfedf072bba4015a33d3d4a98519837295a90f0a23f676d" +dependencies = [ + "objc2", + "objc2-core-foundation", + "objc2-foundation", +] + [[package]] name = "omnipath" version = "0.1.6" @@ -1351,13 +1456,33 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.45" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] +[[package]] +name = "rayon" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "recvmsg" version = "1.0.0" @@ -1406,9 +1531,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.3" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" +checksum = "2a0e75113e14dc5acb068cd0786884f214f1312650a3d36d269f5c4f3cdee8a2" dependencies = [ "aho-corasick", "memchr", @@ -1418,9 +1543,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db" dependencies = [ "aho-corasick", "memchr", @@ -1429,9 +1554,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "rmp" @@ -1454,9 +1579,9 @@ dependencies = [ [[package]] name = "rustc-hash" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" [[package]] name = "rustc_version" @@ -1482,9 +1607,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "ryu" @@ -1509,6 +1634,10 @@ name = "semver" version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" +dependencies = [ + "serde", + "serde_core", +] [[package]] name = "serde" @@ -1622,9 +1751,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.15.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" [[package]] name = "strip-ansi-escapes" @@ -1682,9 +1811,9 @@ checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" [[package]] name = "syn" -version = "2.0.117" +version = "2.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" dependencies = [ "proc-macro2", "quote", @@ -1702,15 +1831,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.38.4" +version = "0.39.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ab6a2f8bfe508deb3c6406578252e491d299cbbf3bc0529ecc3313aee4a52f" +checksum = "d2071df9448915b71c4fe6d25deaf1c22f12bd234f01540b77312bb8e41361e6" dependencies = [ "libc", "memchr", "ntapi", "objc2-core-foundation", "objc2-io-kit", + "objc2-open-directory", "windows", ] @@ -1892,13 +2022,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uucore" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d779636d827cde4100f0e65ff3fd23b0b1f1195055475c6e6813d425f30c8e" +checksum = "069b34217c27f611e1589f540f58118dbf226a9e407d38ab472052ff075a1dc2" dependencies = [ "clap", "fluent", - "fluent-bundle", "fluent-syntax", "libc", "nix", @@ -1913,9 +2042,9 @@ dependencies = [ [[package]] name = "uucore_procs" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da865e8a648b260dbd89fca76d0801995877ab27a4e259b6dec30ba9743b86ab" +checksum = "34337da211e7abfff7189b794afb3b5018fe356fb36474b73645458fc1201350" dependencies = [ "proc-macro2", "quote", @@ -1938,9 +2067,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasm-bindgen" -version = "0.2.122" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409" +checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" dependencies = [ "cfg-if", "once_cell", @@ -1951,9 +2080,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.122" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6" +checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1961,9 +2090,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.122" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e" +checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" dependencies = [ "bumpalo", "proc-macro2", @@ -1974,9 +2103,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.122" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437" +checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" dependencies = [ "unicode-ident", ] @@ -2147,6 +2276,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "winnow" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" +dependencies = [ + "memchr", +] + [[package]] name = "xml" version = "1.3.0" diff --git a/Cargo.toml b/Cargo.toml index dd78432..6e0df15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,20 +1,20 @@ [package] -name = "nu_plugin_dbus" -version = "0.23.0" +name = "nu_plugin_dbus" +version = "0.24.0" edition = "2024" description = "Nushell plugin for communicating with D-Bus" -authors = ["Devyn Cairns "] -license = "MIT" -keywords = ["plugin", "dbus", "nu"] -categories = ["command-line-utilities"] -repository = "https://github.com/devyn/nu_plugin_dbus" +authors = ["Devyn Cairns "] +license = "MIT" +keywords = ["plugin", "dbus", "nu"] +categories = ["command-line-utilities"] +repository = "https://github.com/devyn/nu_plugin_dbus" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dbus = "0.9" -nu-plugin = "0.113.1" -nu-protocol = { version = "0.113.1", features = ["plugin"] } -serde = { version = "1.0.228", features = ["derive"] } +dbus = "0.9" +nu-plugin = "0.114.0" +nu-protocol = { version = "0.114.0", features = ["plugin"] } +serde = { version = "1.0.228", features = ["derive"] } serde-xml-rs = "0.8.2" diff --git a/flake.lock b/flake.lock index 3ad73a0..a662c13 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1780532242, - "narHash": "sha256-D+BsdpxmtUwtqGoY0IXPhHgTlmqgcZKCEo1oMyn7ep0=", + "lastModified": 1783203018, + "narHash": "sha256-G6R9IT/xwFuu+CYBWDUAok6AdC4ERC4ZfPPFtEpxnZE=", "owner": "ipetkov", "repo": "crane", - "rev": "59a82a1222dd3b2080b5cc52a1a2e8d5f1b77f37", + "rev": "80db5bdc391be8a1794f6d8a2d56e3a84ebcede2", "type": "github" }, "original": { @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1779722240, - "narHash": "sha256-cX1d9V5JHTytsSdH8RrgyU4fFdm4oooRuKBcJuiyI4U=", + "lastModified": 1783352529, + "narHash": "sha256-FZDPaZdAAjFbJWR/BoWCCVYB16WV0b472vhUPlQawh0=", "owner": "nix-community", "repo": "flakelight", - "rev": "6908ac68dd682d1cb22fdb9391b890798f083a48", + "rev": "da36ab2f725feb14b287ff1d6d56f6fc8ce6be5a", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780749050, - "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5b511c8..5cbd18d 100644 --- a/flake.nix +++ b/flake.nix @@ -8,59 +8,54 @@ crane.url = "github:ipetkov/crane"; }; - outputs = - inputs@{ self - , nixpkgs - , flakelight - , crane - , - }: + outputs = inputs @ { + self, + nixpkgs, + flakelight, + crane, + }: flakelight ./. { inherit inputs; pname = "nu_plugin_dbus"; - package = - { rustPlatform - , dbus - , nushell - , pkg-config - , fetchFromGitHub - , lib - , pkgs - , - }: - let - craneLib = crane.mkLib pkgs; - src = ./.; - commonArgs = { - inherit src; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - ]; - buildInputs = [ - dbus - ]; - }; - cargoArtifacts = craneLib.buildDepsOnly commonArgs; - nu_plugin_dbus = craneLib.buildPackage ( - commonArgs - // { - inherit cargoArtifacts; - - meta = with lib; { - description = "A nushell plugin for interacting with dbus"; - license = licenses.mit; - mainProgram = "nu_plugin_dbus"; - homepage = "https://github.com/devyn/nu_plugin_dbus"; - }; - } - ); - nu_version = "0.113.1"; - in - if nushell.version == nu_version then - nu_plugin_dbus - else - abort "Nushell Version mismatch\nPlugin: ${nu_version}\tnixpkgs: ${nushell.version}"; + package = { + rustPlatform, + dbus, + nushell, + pkg-config, + fetchFromGitHub, + lib, + pkgs, + }: let + craneLib = crane.mkLib pkgs; + src = ./.; + commonArgs = { + inherit src; + strictDeps = true; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + dbus + ]; + }; + cargoArtifacts = craneLib.buildDepsOnly commonArgs; + nu_plugin_dbus = craneLib.buildPackage ( + commonArgs + // { + inherit cargoArtifacts; + meta = with lib; { + description = "A nushell plugin for interacting with dbus"; + license = licenses.mit; + mainProgram = "nu_plugin_dbus"; + homepage = "https://github.com/devyn/nu_plugin_dbus"; + }; + } + ); + nu_version = "0.114.0"; + in + if nushell.version == nu_version + then nu_plugin_dbus + else abort "Nushell Version mismatch\nPlugin: ${nu_version}\tnixpkgs: ${nushell.version}"; }; } diff --git a/src/commands/get_all.rs b/src/commands/get_all.rs index f0adf80..823b55e 100644 --- a/src/commands/get_all.rs +++ b/src/commands/get_all.rs @@ -1,5 +1,5 @@ use nu_plugin::{EngineInterface, EvaluatedCall, SimplePluginCommand}; -use nu_protocol::{Example, LabeledError, Signature, SyntaxShape, Type, Value}; +use nu_protocol::{CollectionColumns, Example, LabeledError, Signature, SyntaxShape, Type, Value}; use crate::{DbusSignatureUtilExt, client::DbusClient, config::DbusClientConfig}; @@ -17,7 +17,7 @@ impl SimplePluginCommand for GetAll { .dbus_command() .accepts_dbus_client_options() .accepts_timeout() - .input_output_type(Type::Nothing, Type::Record([].into())) + .input_output_type(Type::Nothing, Type::Record(CollectionColumns::default())) .required_named( "dest", SyntaxShape::String, diff --git a/src/commands/introspect.rs b/src/commands/introspect.rs index fbe4eb4..fbb1e31 100644 --- a/src/commands/introspect.rs +++ b/src/commands/introspect.rs @@ -1,5 +1,5 @@ use nu_plugin::{EngineInterface, EvaluatedCall, SimplePluginCommand}; -use nu_protocol::{Example, LabeledError, Signature, SyntaxShape, Type, Value}; +use nu_protocol::{CollectionColumns, Example, LabeledError, Signature, SyntaxShape, Type, Value}; use crate::{DbusSignatureUtilExt, client::DbusClient, config::DbusClientConfig}; @@ -17,7 +17,7 @@ impl SimplePluginCommand for Introspect { .dbus_command() .accepts_dbus_client_options() .accepts_timeout() - .input_output_type(Type::Nothing, Type::Record([].into())) + .input_output_type(Type::Nothing, Type::Record(CollectionColumns::default())) .required_named( "dest", SyntaxShape::String,