From 2903d3990d967e269e4b2bc4e8ad3447fe8486e0 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sat, 4 Jan 2025 16:55:39 +0700 Subject: [PATCH 01/11] slight code refactoring, redirected READMEs to the parent directory --- Cargo.lock | 287 ++++++++++++++++++++++++++++++++++++++++- anda-config/Cargo.toml | 4 +- anda-config/config.rs | 10 +- andax/Cargo.toml | 3 +- clippy.toml | 2 + src/util.rs | 24 ++-- 6 files changed, 308 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3505a2..ba6e381 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,6 +90,7 @@ dependencies = [ "once_cell", "parking_lot", "serde", + "serde_with", "tracing", ] @@ -114,6 +115,21 @@ dependencies = [ "ureq", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "anstream" version = "0.6.18" @@ -239,6 +255,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + [[package]] name = "bytes" version = "1.9.0" @@ -274,7 +296,11 @@ version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ + "android-tzdata", + "iana-time-zone", "num-traits", + "serde", + "windows-targets 0.52.6", ] [[package]] @@ -423,6 +449,12 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + [[package]] name = "cpufeatures" version = "0.2.16" @@ -482,6 +514,51 @@ dependencies = [ "typenum", ] +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + [[package]] name = "digest" version = "0.10.7" @@ -668,6 +745,12 @@ dependencies = [ "serde_yaml", ] +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -732,6 +815,12 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.15.2" @@ -758,7 +847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bad09da74de9366520c7542d7a78da538d79fe6a9fe142877c437e6d165cc67" dependencies = [ "hcl-primitives", - "indexmap", + "indexmap 2.7.0", "itoa", "pest", "pest_derive", @@ -772,12 +861,41 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "icu_collections" version = "1.5.0" @@ -896,6 +1014,12 @@ dependencies = [ "syn", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "1.0.3" @@ -939,6 +1063,17 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + [[package]] name = "indexmap" version = "2.7.0" @@ -946,7 +1081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", "serde", ] @@ -989,6 +1124,16 @@ dependencies = [ "libc", ] +[[package]] +name = "js-sys" +version = "0.3.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + [[package]] name = "kstring" version = "2.0.2" @@ -1183,6 +1328,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-traits" version = "0.2.19" @@ -1338,6 +1489,12 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "proc-macro2" version = "1.0.92" @@ -1625,13 +1782,43 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" +dependencies = [ + "base64", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.7.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "serde_yaml" version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap", + "indexmap 2.7.0", "itoa", "ryu", "serde", @@ -1833,6 +2020,37 @@ dependencies = [ "once_cell", ] +[[package]] +name = "time" +version = "0.3.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" +dependencies = [ + "num-conv", + "time-core", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -2084,6 +2302,60 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasm-bindgen" +version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" + [[package]] name = "webpki-roots" version = "0.26.7" @@ -2124,6 +2396,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" diff --git a/anda-config/Cargo.toml b/anda-config/Cargo.toml index ccd3edf..041967f 100644 --- a/anda-config/Cargo.toml +++ b/anda-config/Cargo.toml @@ -5,8 +5,7 @@ version = "0.4.7" edition = "2021" license = "MIT" repository = "https://github.com/FyraLabs/anda" -# TODO: -# readme = "README.md" +readme = "../README.md" [lib] path = "./lib.rs" @@ -21,6 +20,7 @@ tracing = "0.1" ignore = { workspace = true } once_cell = { version = "1.20", default-features = false, features = ["std"] } parking_lot = "0.12.3" +serde_with = "3.12.0" [dev-dependencies] env_logger = ">= 0.10, < 0.12" diff --git a/anda-config/config.rs b/anda-config/config.rs index 7e8beed..d966d5a 100644 --- a/anda-config/config.rs +++ b/anda-config/config.rs @@ -8,11 +8,13 @@ use tracing::{debug, instrument, trace}; use crate::error::ProjectError; #[derive(Deserialize, Serialize, Debug, Clone)] +#[serde_with::skip_serializing_none] pub struct ProjectData { pub manifest: HashMap, } #[derive(Deserialize, Serialize, Debug, Clone)] +#[serde_with::skip_serializing_none] pub struct Manifest { pub project: BTreeMap, #[serde(default)] @@ -20,6 +22,7 @@ pub struct Manifest { } #[derive(Deserialize, Serialize, Debug, Clone, Default)] +#[serde_with::skip_serializing_none] pub struct Config { pub mock_config: Option, pub strip_prefix: Option, @@ -48,6 +51,7 @@ impl Manifest { } #[derive(Deserialize, PartialEq, Eq, Serialize, Debug, Clone, Default)] +#[serde_with::skip_serializing_none] pub struct Project { pub rpm: Option, pub podman: Option, @@ -76,7 +80,7 @@ where { struct WildString; - impl<'de> serde::de::Visitor<'de> for WildString { + impl serde::de::Visitor<'_> for WildString { type Value = String; fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { @@ -176,6 +180,7 @@ where } #[derive(Deserialize, PartialEq, Eq, Serialize, Debug, Clone, Default)] +#[serde_with::skip_serializing_none] pub struct RpmBuild { pub spec: PathBuf, pub sources: Option, @@ -194,6 +199,7 @@ pub struct RpmBuild { } #[derive(Deserialize, PartialEq, Eq, Serialize, Debug, Clone, Default)] +#[serde_with::skip_serializing_none] pub struct Docker { pub image: BTreeMap, // tag, file } @@ -215,6 +221,7 @@ pub fn parse_labels<'a, I: Iterator>(labels: I) -> Option, pub import: Option, @@ -224,6 +231,7 @@ pub struct DockerImage { } #[derive(Deserialize, PartialEq, Eq, Serialize, Debug, Clone)] +#[serde_with::skip_serializing_none] pub struct Flatpak { pub manifest: PathBuf, pub pre_script: Option, diff --git a/andax/Cargo.toml b/andax/Cargo.toml index 079d92f..12534a0 100644 --- a/andax/Cargo.toml +++ b/andax/Cargo.toml @@ -5,8 +5,7 @@ edition = "2021" license = "MIT" description = "Andaman scripting runtime" repository = "https://github.com/FyraLabs/anda" -# TODO: -# readme = "README.md" +readme = "../README.md" [lib] path = "./lib.rs" diff --git a/clippy.toml b/clippy.toml index 872087d..e735af1 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1,3 +1,5 @@ + + disallowed-types = ["std::sync::Mutex"] disallowed-names = ["binding", ".."] disallowed-macros = ["cmd_lib::run_cmd", "cmd_lib::run_fun"] diff --git a/src/util.rs b/src/util.rs index ae284d8..7dd167e 100644 --- a/src/util.rs +++ b/src/util.rs @@ -47,23 +47,19 @@ pub fn fetch_build_entries(config: Manifest) -> Vec { if let Some(rpm) = project.rpm { if rpm.enable_scm.unwrap_or(false) { - for arch in &*DEFAULT_ARCHES { - entries.push(BuildEntry { - pkg: std::mem::take(&mut name), - arch: arch.clone(), - labels: project.labels.clone(), - }); - } + entries.extend(DEFAULT_ARCHES.iter().map(|arch| BuildEntry { + pkg: std::mem::take(&mut name), + arch: arch.clone(), + labels: project.labels.clone(), + })); continue; } } - for arch in project.arches.unwrap_or_else(|| DEFAULT_ARCHES.to_vec()) { - entries.push(BuildEntry { - pkg: name.clone(), - arch: arch.clone(), - labels: project.labels.clone(), - }); - } + entries.extend(project.arches.unwrap_or_else(|| DEFAULT_ARCHES.to_vec()).into_iter().map(|arch| BuildEntry { + pkg: name.clone(), + arch, + labels: project.labels.clone(), + })); } entries From 42acfcffef79d475ce00f33efa4a7debec76476d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 06:20:33 +0000 Subject: [PATCH 02/11] chore(deps): bump git2 from 0.19.0 to 0.20.0 Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.19.0 to 0.20.0. - [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/git2-rs/compare/git2-0.19.0...git2-0.20.0) --- updated-dependencies: - dependency-name: git2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba6e381..4b6153b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -789,9 +789,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git2" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" +checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff" dependencies = [ "bitflags 2.6.0", "libc", @@ -1164,9 +1164,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libgit2-sys" -version = "0.17.0+1.8.1" +version = "0.18.0+1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" +checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 7f6d743..3819c5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ tokio = { version = "1.42.0", features = [ ] } async-trait = "0.1.83" nix = { version = "0.29.0", features = ["signal"], default-features = false } -git2 = "0.19.0" +git2 = "0.20.0" chrono = { workspace = true } ignore = { workspace = true } promptly = "0.3.1" From 699d0b06eb8f9f4ef3f324695ea8afc9afc20b2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 06:20:41 +0000 Subject: [PATCH 03/11] chore(deps): bump async-trait from 0.1.83 to 0.1.84 Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.83 to 0.1.84. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.83...0.1.84) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba6e381..9b838b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -187,9 +187,9 @@ checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 7f6d743..c623592 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ tokio = { version = "1.42.0", features = [ "signal", "rt-multi-thread", ] } -async-trait = "0.1.83" +async-trait = "0.1.84" nix = { version = "0.29.0", features = ["signal"], default-features = false } git2 = "0.19.0" chrono = { workspace = true } From f856e6fec236b551761525d434570426c58a6615 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 06:20:50 +0000 Subject: [PATCH 04/11] chore(deps): bump itertools from 0.13.0 to 0.14.0 Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.13.0 to 0.14.0. - [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-itertools/itertools/compare/v0.13.0...v0.14.0) --- updated-dependencies: - dependency-name: itertools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba6e381..dc392e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1102,9 +1102,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] diff --git a/Cargo.toml b/Cargo.toml index 7f6d743..f3e8323 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ console = "0.15.10" serde = { workspace = true } serde_json = { workspace = true } regex = { workspace = true } -itertools = "0.13.0" +itertools = "0.14.0" lazy_format = "2.0.3" lazy_static = { workspace = true } shell-quote = "0.7.1" From 98d715cd90ad35bb257d3292317ac3cdee55d132 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 06:20:58 +0000 Subject: [PATCH 05/11] chore(deps): bump tempfile from 3.14.0 to 3.15.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.14.0 to 3.15.0. - [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md) - [Commits](https://github.com/Stebalien/tempfile/compare/v3.14.0...v3.15.0) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 5 +++-- Cargo.toml | 2 +- andax/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba6e381..2ddfc52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1950,12 +1950,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom", "once_cell", "rustix", "windows-sys 0.59.0", diff --git a/Cargo.toml b/Cargo.toml index 7f6d743..43377fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ tracing-subscriber = "0.3" tracing-log = "0.2.0" color-eyre = { workspace = true } walkdir = "2.5.0" -tempfile = "3.14.0" +tempfile = "3.15.0" anda-config = { workspace = true } andax = { path = "./andax", version = "0.4.7" } flatpak = "0.18.1" diff --git a/andax/Cargo.toml b/andax/Cargo.toml index 12534a0..759a1c8 100644 --- a/andax/Cargo.toml +++ b/andax/Cargo.toml @@ -21,7 +21,7 @@ ureq = { version = "~2", features = ["json"] } tracing = { workspace = true } color-eyre = { workspace = true } smartstring = "1.0.1" -tempfile = "3.14.0" +tempfile = "3.15.0" anda-config = { workspace = true } rhai-fs = "0.1.2" rhai-url = "0.0.5" From a780f0b0bf488060aff4d1639187dc21bb297c1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 06:21:10 +0000 Subject: [PATCH 06/11] chore(deps): bump shell-quote from 0.7.1 to 0.7.2 Bumps [shell-quote](https://github.com/allenap/shell-quote) from 0.7.1 to 0.7.2. - [Commits](https://github.com/allenap/shell-quote/compare/v0.7.1...v0.7.2) --- updated-dependencies: - dependency-name: shell-quote dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba6e381..2bcc831 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1847,9 +1847,9 @@ dependencies = [ [[package]] name = "shell-quote" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae4c63bdcc11eea49b562941b914d5ac30d42cad982e3f6e846a513ee6a3ce7e" +checksum = "fb502615975ae2365825521fa1529ca7648fd03ce0b0746604e0683856ecd7e4" dependencies = [ "bstr", ] diff --git a/Cargo.toml b/Cargo.toml index 7f6d743..87ee290 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ regex = { workspace = true } itertools = "0.13.0" lazy_format = "2.0.3" lazy_static = { workspace = true } -shell-quote = "0.7.1" +shell-quote = "0.7.2" [lints] From b3644fc82993a3ae7d66ef93bcd6ee403894389b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 06:17:45 +0000 Subject: [PATCH 07/11] chore(deps): bump clap from 4.5.23 to 4.5.26 Bumps [clap](https://github.com/clap-rs/clap) from 4.5.23 to 4.5.26. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.23...clap_complete-v4.5.26) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88cc934..6540e2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -305,9 +305,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783" dependencies = [ "clap_builder", "clap_derive", @@ -325,9 +325,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121" dependencies = [ "anstream", "anstyle", @@ -346,9 +346,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" dependencies = [ "heck", "proc-macro2", @@ -682,7 +682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -1670,7 +1670,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -1959,7 +1959,7 @@ dependencies = [ "getrandom", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2388,7 +2388,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] From 672f640ce8de9d92956f4147e3936f0fecbcd552 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 06:17:55 +0000 Subject: [PATCH 08/11] chore(deps): bump directories from 5.0.1 to 6.0.0 Bumps [directories](https://github.com/soc/directories-rs) from 5.0.1 to 6.0.0. - [Commits](https://github.com/soc/directories-rs/commits) --- updated-dependencies: - dependency-name: directories dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 25 ++++++++++++++++++------- andax/Cargo.toml | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88cc934..f827011 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -571,9 +571,9 @@ dependencies = [ [[package]] name = "directories" -version = "5.0.1" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d" dependencies = [ "dirs-sys", ] @@ -590,14 +590,14 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users", - "windows-sys 0.48.0", + "redox_users 0.5.0", + "windows-sys 0.59.0", ] [[package]] @@ -607,7 +607,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users", + "redox_users 0.4.6", "winapi", ] @@ -1552,6 +1552,17 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "redox_users" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +dependencies = [ + "getrandom", + "libredox", + "thiserror 2.0.9", +] + [[package]] name = "regex" version = "1.11.1" diff --git a/andax/Cargo.toml b/andax/Cargo.toml index 759a1c8..6960cd0 100644 --- a/andax/Cargo.toml +++ b/andax/Cargo.toml @@ -26,7 +26,7 @@ anda-config = { workspace = true } rhai-fs = "0.1.2" rhai-url = "0.0.5" hcl-rs = "0.15.0" -directories = "5.0.1" +directories = "6.0.0" chrono = { workspace = true } [lints] From 241af253f6c7608e81e9cc844c117d7a3725924e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 06:18:05 +0000 Subject: [PATCH 09/11] chore(deps): bump clap_mangen from 0.2.24 to 0.2.26 Bumps [clap_mangen](https://github.com/clap-rs/clap) from 0.2.24 to 0.2.26. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_mangen-v0.2.24...clap_mangen-v0.2.26) --- updated-dependencies: - dependency-name: clap_mangen dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- xtask/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88cc934..7771a6e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -364,9 +364,9 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "clap_mangen" -version = "0.2.24" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbae9cbfdc5d4fa8711c09bd7b83f644cb48281ac35bf97af3e47b0675864bdf" +checksum = "724842fa9b144f9b89b3f3d371a89f3455eea660361d13a554f68f8ae5d6c13a" dependencies = [ "clap", "roff", diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index d71fb0a..1f59dfc 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -7,7 +7,7 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -clap_mangen = "0.2.24" +clap_mangen = "0.2.26" anda = { path = ".." } clap = { workspace = true } anyhow = "1.0.95" From 16d293fb877ffbb6583c58c0fa01d95d7f7213e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 06:18:15 +0000 Subject: [PATCH 10/11] chore(deps): bump async-trait from 0.1.84 to 0.1.85 Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.84 to 0.1.85. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](https://github.com/dtolnay/async-trait/compare/0.1.84...0.1.85) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88cc934..c1dc221 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -187,9 +187,9 @@ checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "async-trait" -version = "0.1.84" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index b2cce43..9cbf701 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ tokio = { version = "1.42.0", features = [ "signal", "rt-multi-thread", ] } -async-trait = "0.1.84" +async-trait = "0.1.85" nix = { version = "0.29.0", features = ["signal"], default-features = false } git2 = "0.20.0" chrono = { workspace = true } From cc32630cd3844c67c88e6b456d2e9d877c138562 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 06:18:24 +0000 Subject: [PATCH 11/11] chore(deps): bump tokio from 1.42.0 to 1.43.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.42.0 to 1.43.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.42.0...tokio-1.43.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 88cc934..baeae57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2073,9 +2073,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -2089,9 +2089,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index b2cce43..397620e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ anda-config = { workspace = true } andax = { path = "./andax", version = "0.4.7" } flatpak = "0.18.1" clap-verbosity-flag = "3.0.2" -tokio = { version = "1.42.0", features = [ +tokio = { version = "1.43.0", features = [ "process", "io-util", "macros",