From 8a33382ab904fb4602e4fb9639ae942ae7ac9e45 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Tue, 2 Jul 2024 14:44:23 -0700 Subject: [PATCH 1/2] Update deps. --- Cargo.lock | 248 ++++++++++++++++++++++++++++------------------------- Cargo.toml | 4 +- 2 files changed, 131 insertions(+), 121 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 139d2f6..5476591 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,7 +119,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -189,9 +189,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -209,7 +209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.7", "serde", ] @@ -221,9 +221,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -261,7 +261,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -669,7 +669,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -680,7 +680,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -700,7 +700,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -795,7 +795,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -806,9 +806,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -868,9 +868,9 @@ dependencies = [ [[package]] name = "extism-convert" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96dda334f4d05d02504c7c6fd8b2a5fb9caf77aea956fd5a25e467d6df4e813" +checksum = "2e5a978634c28e4b150213cc8265c211f24421a8ee5dea4126ece0dc60cbc709" dependencies = [ "anyhow", "base64 0.22.1", @@ -884,22 +884,22 @@ dependencies = [ [[package]] name = "extism-convert-macros" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f542da6bda406e348633328bf13b71c15b08dc14a92b62fb724ac17f0081fe1" +checksum = "c40464260bcb3982b9e1967e2446ebea4a4637772c1b39f29b6410f555367092" dependencies = [ "manyhow", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "extism-manifest" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97da8e6e2803cc3ac8cde2529e027da013413555c421edfabddbf8a637f52548" +checksum = "a60b6ea31edc0831e28665b4e808175dd5acd4602bfcc5d31f09c97f334238d1" dependencies = [ "base64 0.22.1", "serde", @@ -929,7 +929,7 @@ checksum = "3a024b0f20295098d1d19ad443fad077c1d8c1d81d09a2c20f0618ebd201517e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1098,7 +1098,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "debugid", "fxhash", "serde", @@ -1107,9 +1107,9 @@ dependencies = [ [[package]] name = "garde" -version = "0.18.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fa8fb3ffe035745c6194540b2064b2fe275f32367fbb4eb026024b7921e2e5" +checksum = "29a44029f2f9359712d0c34cb78dc36266e9949ffbfcc13f5f737f6e6f1a7226" dependencies = [ "compact_str", "garde_derive", @@ -1120,14 +1120,14 @@ dependencies = [ [[package]] name = "garde_derive" -version = "0.18.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf62650515830c41553b72bd49ec20fb120226f9277c7f2847f071cf998325b" +checksum = "f5e2e952fbf2bcd9dae6854d7ebcbfb05f261656d1131f4f1f4fac9da450adec" dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1177,8 +1177,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -1187,7 +1187,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "ignore", "walkdir", ] @@ -1406,7 +1406,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -1500,15 +1500,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.11" @@ -1561,9 +1552,9 @@ checksum = "c3d129799327c8f80861e467c59b825ba24c277dba6ad0d71a141dc98f9e04ee" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "leb128" @@ -1583,7 +1574,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -1617,9 +1608,9 @@ checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lzma-sys" @@ -1650,7 +1641,7 @@ dependencies = [ "manyhow-macros", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1681,9 +1672,9 @@ checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memfd" @@ -1723,7 +1714,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1770,7 +1761,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", ] @@ -1926,7 +1917,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2024,9 +2015,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2048,10 +2039,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.10.5", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2069,7 +2060,7 @@ dependencies = [ "proto_shim", "regex", "reqwest", - "rustc-hash", + "rustc-hash 1.1.0", "schematic", "semver", "serde", @@ -2079,7 +2070,7 @@ dependencies = [ "starbase_archive", "starbase_events", "starbase_styles", - "starbase_utils", + "starbase_utils 0.7.5", "thiserror", "tracing", "url", @@ -2090,24 +2081,24 @@ dependencies = [ [[package]] name = "proto_pdk" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34fac0e13aad44867798931b9f98851483d5e276190c23b200cf5b7d8fe1f88" +checksum = "b0cc15eb5f3bdea06e409ae31aaa918bc7b9798b8a62196aa320605b85cdd873" dependencies = [ "extism-pdk", "proto_pdk_api", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "warpgate_pdk", ] [[package]] name = "proto_pdk_api" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d666fea2b722e6362b05eade29ae212341bdd5b2e244aaa1613b717dc2a188" +checksum = "eb274c86fd9e2c5018a3154e12b5bb8b8b9f72755c2956dad629385732cfce0f" dependencies = [ - "rustc-hash", + "rustc-hash 2.0.0", "semver", "serde", "serde_json", @@ -2237,7 +2228,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -2259,7 +2250,7 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", - "rustc-hash", + "rustc-hash 1.1.0", "slice-group-by", "smallvec", ] @@ -2272,8 +2263,8 @@ checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -2287,13 +2278,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -2304,9 +2295,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "relative-path" @@ -2407,13 +2398,19 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustix" version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "itoa", "libc", @@ -2508,9 +2505,9 @@ dependencies = [ [[package]] name = "schematic" -version = "0.16.4" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a97356d9a387d6963940ab05de6ac9dbee0c3c97090247954c3d4c2ddc5b8d" +checksum = "5186a0ee6296b0bec9f35d0e926e1cb736f14b557875a52847dbfb757385f50c" dependencies = [ "garde", "indexmap 2.2.6", @@ -2527,22 +2524,22 @@ dependencies = [ [[package]] name = "schematic_macros" -version = "0.16.4" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "906eff11b3963e20f5d33fb6dfc67d84351769917970c0d7ebf86e1782d869b5" +checksum = "fbba5ab97b490c225145d5beba9d565c49049a4c3798227d9ef1dba23f6fcb0f" dependencies = [ "convert_case", "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "schematic_types" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "788660c0972a2aab386e2b4b8bd304e0b21c21751e2722cead28d059597d3dad" +checksum = "e23da8bf72241430f0a710266256139667125e51d11283e60147df0015da4758" dependencies = [ "indexmap 2.2.6", "serde_json", @@ -2562,7 +2559,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2605,14 +2602,14 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -2764,9 +2761,9 @@ dependencies = [ "binstall-tar", "flate2", "miette", - "rustc-hash", + "rustc-hash 1.1.0", "starbase_styles", - "starbase_utils", + "starbase_utils 0.7.5", "thiserror", "tracing", "xz2", @@ -2795,14 +2792,14 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "starbase_sandbox" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dc8cc21fc2c389549297a2049074bf22a34aceb8ed8d31be6e1df42648abcb8" +checksum = "ee8d70a85be618d0ea80eb99c8f22ad7200414c20e03f1ac2f31062d9e4ed4b5" dependencies = [ "assert_cmd", "assert_fs", @@ -2811,14 +2808,14 @@ dependencies = [ "once_cell", "predicates", "pretty_assertions", - "starbase_utils", + "starbase_utils 0.8.0", ] [[package]] name = "starbase_styles" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e483937f25c81ee4a5b70b608436025d23bffa656d62793ea5bbe6e9b94206d" +checksum = "dcdc25102288ba49a8ae037a3de74dde8bcd519dfe00dc00dae4ed7344475983" dependencies = [ "dirs 5.0.1", "owo-colors", @@ -2849,6 +2846,19 @@ dependencies = [ "wax", ] +[[package]] +name = "starbase_utils" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dbe00ed72e809e023642fb2d181516befcc10cb517da9a47bbb6904ec8614ab" +dependencies = [ + "dirs 5.0.1", + "once_cell", + "starbase_styles", + "thiserror", + "tracing", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -2889,9 +2899,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -2931,7 +2941,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cap-fs-ext", "cap-std", "fd-lock", @@ -2995,7 +3005,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3010,9 +3020,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -3050,7 +3060,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3128,7 +3138,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.9", + "winnow 0.6.13", ] [[package]] @@ -3178,7 +3188,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3261,9 +3271,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -3387,7 +3397,7 @@ dependencies = [ "sha2", "starbase_archive", "starbase_styles", - "starbase_utils", + "starbase_utils 0.7.5", "system_env", "thiserror", "tracing", @@ -3401,7 +3411,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06b88df2c2215ce9236dbf8da85a66d4c27810fec26e370ff416b5a13d1d182b" dependencies = [ "anyhow", - "rustc-hash", + "rustc-hash 1.1.0", "schematic", "serde", "serde_json", @@ -3456,7 +3466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85972c7523e1ac970c576007ee02b69645c9b6a811276495d4c37908971ff9bb" dependencies = [ "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "cap-rand", "cap-std", "io-extras", @@ -3490,7 +3500,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -3524,7 +3534,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3569,7 +3579,7 @@ version = "0.121.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "indexmap 2.2.6", "semver", ] @@ -3661,7 +3671,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -3853,7 +3863,7 @@ checksum = "e04682ce587aa8fa9311d3c95148381f08a1db274ad6bcd3553f7c97c8c2debb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3864,7 +3874,7 @@ checksum = "5f06353b0c0cbe4f94fbf200e782729b5ae383dd7a112e25d516d535e8dd96ab" dependencies = [ "anyhow", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "cap-fs-ext", "cap-net-ext", @@ -3999,7 +4009,7 @@ checksum = "cc07496af9cb4377dabd78ead77564302c8c34c0a75dcd11b02f0ebe11c5fa10" dependencies = [ "anyhow", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "thiserror", "tracing", "wasmtime", @@ -4017,7 +4027,7 @@ dependencies = [ "proc-macro2", "quote", "shellexpand", - "syn 2.0.66", + "syn 2.0.68", "witx", ] @@ -4029,7 +4039,7 @@ checksum = "4a781d29bfd788595f4a392a6f606699e59577b7f4b2858da2ae4068f4d757c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wiggle-generate", ] @@ -4239,9 +4249,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.9" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -4262,7 +4272,7 @@ version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "windows-sys 0.52.0", ] @@ -4338,7 +4348,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d3899fb..90f7f4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,13 +10,13 @@ crate-type = ['cdylib'] [dependencies] extism-pdk = { version = "1.2.0" } -proto_pdk = { version = "0.21.0" } #, path = "../../proto/crates/pdk" } +proto_pdk = { version = "0.21.1" } #, path = "../../proto/crates/pdk" } regex = { version = "1.10.5", default-features = false, features = ["std"] } serde = "1.0.203" [dev-dependencies] proto_pdk_test_utils = { version = "0.25.0" } #, path = "../../proto/crates/pdk-test-utils" } -starbase_sandbox = "0.6.2" +starbase_sandbox = "0.6.4" tokio = { version = "1.38.0", features = ["full"] } [features] From 47d75a80c478a4e3b9f913697a00acd9c6c4cc84 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Tue, 2 Jul 2024 14:53:33 -0700 Subject: [PATCH 2/2] Update impl. --- CHANGELOG.md | 6 ++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- src/proto.rs | 15 +++++++-------- src/version.rs | 4 +--- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27330f0..52e9a33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.10.4 + +#### 🚀 Updates + +- Updated to support proto v0.37 release. + ## 0.10.3 #### 🚀 Updates diff --git a/Cargo.lock b/Cargo.lock index 5476591..5a81954 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2143,7 +2143,7 @@ dependencies = [ [[package]] name = "python_plugin" -version = "0.10.3" +version = "0.10.4" dependencies = [ "extism-pdk", "proto_pdk", diff --git a/Cargo.toml b/Cargo.toml index 90f7f4e..9aa0551 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "python_plugin" -version = "0.10.3" +version = "0.10.4" edition = "2021" license = "MIT" publish = false diff --git a/src/proto.rs b/src/proto.rs index 3a3d9b8..92e6b1d 100644 --- a/src/proto.rs +++ b/src/proto.rs @@ -145,7 +145,7 @@ pub fn locate_executables( .os .for_native("install/bin/python", "install/python.exe") .to_owned(); - let mut scripts_dir = env + let mut exes_dir = env .os .for_native("install/bin", "install/Scripts") .to_owned(); @@ -160,7 +160,7 @@ pub fn locate_executables( exe_path = manifest.python_exe; if let Some(dir) = manifest.python_paths.get("scripts") { - scripts_dir = dir.to_owned(); + dir.clone_into(&mut exes_dir); } if let Some(index) = manifest.python_major_minor_version.find('.') { @@ -168,10 +168,8 @@ pub fn locate_executables( } } // Otherwise this was built from source - else { - if let Some(version) = input.context.version.as_version() { - major_version = version.major.to_string(); - }; + else if let Some(version) = input.context.version.as_version() { + major_version = version.major.to_string(); } // Create a secondary executable that includes the major version as a suffix @@ -184,7 +182,7 @@ pub fn locate_executables( ), // pip ( - format!("pip"), + "pip".into(), ExecutableConfig { no_bin: true, shim_before_args: Some(StringOrVec::Vec(vec!["-m".into(), "pip".into()])), @@ -203,7 +201,8 @@ pub fn locate_executables( ]); Ok(Json(LocateExecutablesOutput { - globals_lookup_dirs: vec![format!("$TOOL_DIR/{scripts_dir}")], + globals_lookup_dirs: vec![format!("$TOOL_DIR/{exes_dir}")], + exes_dir: Some(exes_dir.into()), primary: Some(ExecutableConfig::new(exe_path)), secondary, ..LocateExecutablesOutput::default() diff --git a/src/version.rs b/src/version.rs index 9a9e514..ec29865 100644 --- a/src/version.rs +++ b/src/version.rs @@ -3,9 +3,7 @@ use regex::Regex; pub fn from_python_version(version: String, regex: &Regex) -> Option { - let Some(caps) = regex.captures(&version) else { - return None; - }; + let caps = regex.captures(&version)?; let mut version = format!( "{}.{}.{}",