From be6e10a0a8a9a746988642ba0a6aaffffa6261c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Tue, 24 Sep 2024 16:02:36 +0000 Subject: [PATCH 1/4] bump deps --- Cargo.lock | 381 +++++++++++------------------------------------------ 1 file changed, 78 insertions(+), 303 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d47c11b2f..b8a29515b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -95,13 +95,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.99" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -151,15 +151,15 @@ dependencies = [ [[package]] name = "critical-section" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" +checksum = "f64009896348fc5af4222e9cf7d7d82a95a256c634ebcf61c53e4ea461422242" [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -167,38 +167,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.66", -] - -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -298,7 +287,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -406,7 +395,7 @@ checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ "atomic-polyfill", "hash32 0.2.1", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "serde", "spin", "stable_deref_trait", @@ -423,124 +412,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -549,14 +420,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -572,9 +441,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", @@ -588,18 +457,18 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libgit2-sys" @@ -621,9 +490,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -631,12 +500,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - [[package]] name = "lm75" version = "0.2.0" @@ -710,7 +573,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -876,15 +739,9 @@ checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - [[package]] name = "panic-persist" version = "0.3.0" @@ -920,15 +777,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" [[package]] name = "postcard" @@ -967,18 +824,18 @@ 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", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1037,7 +894,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1098,9 +955,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -1186,7 +1043,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1209,7 +1066,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1238,10 +1095,10 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.13.2" +name = "shlex" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "smlang" @@ -1434,9 +1291,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -1455,17 +1312,6 @@ dependencies = [ "vcell", ] -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "tca9539" version = "0.2.1" @@ -1478,32 +1324,52 @@ dependencies = [ ] [[package]] -name = "tinystr" -version = "0.7.6" +name = "tinyvec" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ - "displaydoc", - "zerovec", + "tinyvec_macros", ] +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "ufmt-write" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e87a2ed6b42ec5e28cc3b94c09982969e9227600b2e3dcbc1db927a84c06bd69" +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + +[[package]] +name = "unicode-normalization" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -1532,18 +1398,6 @@ dependencies = [ "usb-device", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - [[package]] name = "varint-rs" version = "2.2.0" @@ -1564,9 +1418,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "void" @@ -1583,18 +1437,6 @@ dependencies = [ "vcell", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - [[package]] name = "yafnv" version = "3.0.0" @@ -1603,70 +1445,3 @@ checksum = "a98cd19b5e3fbcda406d58efc9f5cb2d6e82e381708d52f357b3b3cfb19559b1" dependencies = [ "num-traits", ] - -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] - -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] From 9cdbad1e9dac99b96a530420924307a000d2c3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Tue, 24 Sep 2024 16:06:56 +0000 Subject: [PATCH 2/4] bump miniconf (enum) --- Cargo.lock | 38 ++++++++++++-------------------------- Cargo.toml | 4 ++-- serial-settings/Cargo.toml | 2 +- 3 files changed, 15 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b8a29515b..38c2ead65 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -554,21 +554,19 @@ dependencies = [ [[package]] name = "miniconf" version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017bf72035f1e4e111f1a62031bcf659fa88d434ddadfa33bb390d616adc63fa" +source = "git+http://github.com/quartiq/miniconf.git?branch=enum#46b49abba63d054f1c1315df4154fbcd989c6f70" dependencies = [ "itoa", "miniconf_derive", "postcard", "serde", - "serde-json-core 0.5.1", + "serde-json-core", ] [[package]] name = "miniconf_derive" version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce5d455e44c19b52e2455f7591d1727a6b361341d60c39de3a3f728edfa6814" +source = "git+http://github.com/quartiq/miniconf.git?branch=enum#46b49abba63d054f1c1315df4154fbcd989c6f70" dependencies = [ "darling", "proc-macro2", @@ -579,16 +577,15 @@ dependencies = [ [[package]] name = "miniconf_mqtt" version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769da289221885b9bd4a1b49fc60b8a90f03fe9d69c7363aa36d260b46fd9977" +source = "git+http://github.com/quartiq/miniconf.git?branch=enum#46b49abba63d054f1c1315df4154fbcd989c6f70" dependencies = [ "embedded-io", "heapless 0.8.0", "log", "miniconf", "minimq", - "serde-json-core 0.5.1", - "smlang 0.7.0", + "serde-json-core", + "smlang 0.8.0", ] [[package]] @@ -1013,17 +1010,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-json-core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9e1ab533c0bc414c34920ec7e5f097101d126ed5eac1a1aac711222e0bbb33" -dependencies = [ - "heapless 0.7.17", - "ryu", - "serde", -] - [[package]] name = "serde-json-core" version = "0.6.0" @@ -1111,11 +1097,11 @@ dependencies = [ [[package]] name = "smlang" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575de1cab77b6c852f1f61227755ca0c500d75d3e87317b67eee3ad110d1d4ca" +checksum = "1de84f9f80bbe6272174e2bfdb8cf7ce4815b218038a42161c2f21c1d872c215" dependencies = [ - "smlang-macros 0.7.0", + "smlang-macros 0.8.0", ] [[package]] @@ -1131,9 +1117,9 @@ dependencies = [ [[package]] name = "smlang-macros" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aa9703a40b34abf1d323658a18b197f30f450358f9fd49fe8f7a687bfe301f4" +checksum = "231b4425dcc43afc7e18c34e7c6738cd252d42d91d909c948df14107c9ae79f1" dependencies = [ "proc-macro2", "quote", @@ -1215,7 +1201,7 @@ dependencies = [ "rtt-target", "sequential-storage", "serde", - "serde-json-core 0.6.0", + "serde-json-core", "serde_with", "serial-settings", "shared-bus", diff --git a/Cargo.toml b/Cargo.toml index 6bc6f8555..c7917fa86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,8 +66,8 @@ minimq = "0.9.0" usb-device = "0.3.2" usbd-serial = "0.2" # Keep this synced with the miniconf version in py/setup.py -miniconf = { version = "0.13", features = ["json-core", "derive", "postcard"] } -miniconf_mqtt = { version = "0.13" } +miniconf = { version = "0.13", features = ["json-core", "derive", "postcard"], git = "http://github.com/quartiq/miniconf.git", branch = "enum" } +miniconf_mqtt = { version = "0.13", git = "http://github.com/quartiq/miniconf.git", branch = "enum" } tca9539 = "0.2" smoltcp-nal = { version = "0.5", features = ["shared-stack"] } postcard = "1" diff --git a/serial-settings/Cargo.toml b/serial-settings/Cargo.toml index 42f396ede..5046f4f1f 100644 --- a/serial-settings/Cargo.toml +++ b/serial-settings/Cargo.toml @@ -17,7 +17,7 @@ repository = "https://github.com/quartiq/stabilizer" maintenance = { status = "actively-developed" } [dependencies] -miniconf = { version = "0.13", features = ["json-core", "postcard"] } +miniconf = { version = "0.13", features = ["json-core", "postcard"], git = "http://github.com/quartiq/miniconf.git", branch = "enum" } menu = { version = "0.6", features = ["echo"], git = "https://github.com/rust-embedded-community/menu.git", rev = "ac34f7c" } heapless = "0.8" embedded-io = "0.6" From ab20bc418f9b331e276490e5c3201e5ed60a4b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Tue, 24 Sep 2024 21:56:25 +0000 Subject: [PATCH 3/4] bump miniconf (clippy) --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38c2ead65..5f4992aba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -554,7 +554,7 @@ dependencies = [ [[package]] name = "miniconf" version = "0.13.0" -source = "git+http://github.com/quartiq/miniconf.git?branch=enum#46b49abba63d054f1c1315df4154fbcd989c6f70" +source = "git+http://github.com/quartiq/miniconf.git?branch=enum#3e5d60b828bcf5fc909ccd146e1c528534a4018c" dependencies = [ "itoa", "miniconf_derive", @@ -566,7 +566,7 @@ dependencies = [ [[package]] name = "miniconf_derive" version = "0.13.0" -source = "git+http://github.com/quartiq/miniconf.git?branch=enum#46b49abba63d054f1c1315df4154fbcd989c6f70" +source = "git+http://github.com/quartiq/miniconf.git?branch=enum#3e5d60b828bcf5fc909ccd146e1c528534a4018c" dependencies = [ "darling", "proc-macro2", @@ -577,7 +577,7 @@ dependencies = [ [[package]] name = "miniconf_mqtt" version = "0.13.1" -source = "git+http://github.com/quartiq/miniconf.git?branch=enum#46b49abba63d054f1c1315df4154fbcd989c6f70" +source = "git+http://github.com/quartiq/miniconf.git?branch=enum#3e5d60b828bcf5fc909ccd146e1c528534a4018c" dependencies = [ "embedded-io", "heapless 0.8.0", From c8b4723dcda68218e7b0f2b5dd63a956df6f11ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Thu, 26 Sep 2024 10:06:17 +0000 Subject: [PATCH 4/4] miniconf 0.14 --- Cargo.lock | 17 ++++++++++------- Cargo.toml | 4 ++-- py/pyproject.toml | 2 +- serial-settings/Cargo.toml | 4 ++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5f4992aba..3aa780250 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -546,15 +546,16 @@ dependencies = [ [[package]] name = "menu" version = "0.6.0" -source = "git+https://github.com/rust-embedded-community/menu.git?rev=ac34f7c#ac34f7ccb91a77cb3bc9b582c0515dad6d66714b" +source = "git+https://github.com/rust-embedded-community/menu.git#ac34f7ccb91a77cb3bc9b582c0515dad6d66714b" dependencies = [ "embedded-io", ] [[package]] name = "miniconf" -version = "0.13.0" -source = "git+http://github.com/quartiq/miniconf.git?branch=enum#3e5d60b828bcf5fc909ccd146e1c528534a4018c" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8954fad4aada6a559edc5753c428cde9bc1d317f7672a5898b9943e7be414abc" dependencies = [ "itoa", "miniconf_derive", @@ -565,8 +566,9 @@ dependencies = [ [[package]] name = "miniconf_derive" -version = "0.13.0" -source = "git+http://github.com/quartiq/miniconf.git?branch=enum#3e5d60b828bcf5fc909ccd146e1c528534a4018c" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce0cba49d607e4b2ab1b511d182112d5833397f6bb3f404b666e1be6bf94bd43" dependencies = [ "darling", "proc-macro2", @@ -576,8 +578,9 @@ dependencies = [ [[package]] name = "miniconf_mqtt" -version = "0.13.1" -source = "git+http://github.com/quartiq/miniconf.git?branch=enum#3e5d60b828bcf5fc909ccd146e1c528534a4018c" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b62859f66f4e14fa77ec84605845a6ad9b95447630b05535e529507db35dafc" dependencies = [ "embedded-io", "heapless 0.8.0", diff --git a/Cargo.toml b/Cargo.toml index c7917fa86..7909ab36f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,8 +66,8 @@ minimq = "0.9.0" usb-device = "0.3.2" usbd-serial = "0.2" # Keep this synced with the miniconf version in py/setup.py -miniconf = { version = "0.13", features = ["json-core", "derive", "postcard"], git = "http://github.com/quartiq/miniconf.git", branch = "enum" } -miniconf_mqtt = { version = "0.13", git = "http://github.com/quartiq/miniconf.git", branch = "enum" } +miniconf = { version = "0.14", features = ["json-core", "derive", "postcard"] } +miniconf_mqtt = { version = "0.14" } tca9539 = "0.2" smoltcp-nal = { version = "0.5", features = ["shared-stack"] } postcard = "1" diff --git a/py/pyproject.toml b/py/pyproject.toml index 6f2bab78b..dcf5a6029 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -18,7 +18,7 @@ dependencies = [ "numpy", "scipy", "matplotlib", - "miniconf-mqtt@git+https://github.com/quartiq/miniconf@v0.13.1#subdirectory=py/miniconf-mqtt", + "miniconf-mqtt@git+https://github.com/quartiq/miniconf@v0.14.0#subdirectory=py/miniconf-mqtt", ] [project.urls] diff --git a/serial-settings/Cargo.toml b/serial-settings/Cargo.toml index 5046f4f1f..c042b9537 100644 --- a/serial-settings/Cargo.toml +++ b/serial-settings/Cargo.toml @@ -17,8 +17,8 @@ repository = "https://github.com/quartiq/stabilizer" maintenance = { status = "actively-developed" } [dependencies] -miniconf = { version = "0.13", features = ["json-core", "postcard"], git = "http://github.com/quartiq/miniconf.git", branch = "enum" } -menu = { version = "0.6", features = ["echo"], git = "https://github.com/rust-embedded-community/menu.git", rev = "ac34f7c" } +miniconf = { version = "0.14", features = ["json-core", "postcard"] } +menu = { version = "0.6", features = ["echo"], git = "https://github.com/rust-embedded-community/menu.git" } heapless = "0.8" embedded-io = "0.6" yafnv = "3.0"