chore: update dependencies

Cargo.toml

@@ -21,7 +21,6 @@ tracing = "0.1"
 tracing-subscriber = "0.3"
 tracing-log = "0.1.3"
 color-eyre = "0.6.2"
-toml = "0.7.1"
 walkdir = "2.3.2"
 tempfile = "3.4.0"
 anda-config = { path = "./anda-config", version = "0.1.6" }
@@ -33,7 +32,7 @@ clap_complete = "4.1.5"
 cmd_lib = "1.3.0"
 tokio = { version = "1.28.2", features = ["full"] }
 async-trait = "0.1.67"
-nix = "0.26.2"
+nix = { version = "0.26.2", features = ["signal"], default-features = false }
 git2 = "0.17.2"
 chrono = "0.4.24"
 ignore = "0.4.18"

anda-config/Cargo.toml

@@ -21,7 +21,7 @@ num-traits = "0.2.15"
 regex = "~1"
 walkdir = "2.3.2"
 ignore = "0.4"
-once_cell = "1.16"
+once_cell = { version = "1.16", default-features = false, features = ["critical-section"] }
 parking_lot = "0.12.1"
 
 [dev-dependencies]

anda-config/src/config.rs

@@ -38,7 +38,7 @@ impl Manifest {
         self.project.get(key).map_or_else(
             || {
                 self.project.iter().find_map(|(_k, v)| {
-                    let Some(alias) = &v.alias else { return None };
+                    let alias = v.alias.as_ref()?;
                     if alias.contains(&key.to_string()) {
                         Some(v)
                     } else {
@@ -272,7 +272,7 @@ pub fn load_from_string(config: &str) -> Result<Manifest, ProjectError> {
 }
 
 /// Lints and checks the config for errors.
-/// 
+///
 /// # Errors
 /// - nothing. This function literally does nothing. For now.
 pub const fn check_config(config: Manifest) -> Result<Manifest, ProjectError> {

anda-config/src/context.rs

@@ -11,7 +11,7 @@ use parking_lot::Mutex;
 static GLOBAL_CONTEXT: OnceCell<Mutex<Context>> = OnceCell::new();
 
 /// Generate Context for HCL evaluation
-/// 
+///
 /// # Panics
 /// - cannot lock mutex (poison?)
 /// - cannot convert FuncArgs to str
@@ -32,7 +32,7 @@ pub fn hcl_context() -> Context<'static> {
         let env = std::env::vars().collect::<BTreeMap<String, String>>();
         let mut map = hcl::Map::new();
 
-        map.extend(env.into_iter().map(|(k,v)| (k, Value::String(v))));
+        map.extend(env.into_iter().map(|(k, v)| (k, Value::String(v))));
 
         ctx.declare_var("env", Value::Object(map));
 

anda-config/src/template.rs

@@ -4,7 +4,7 @@ use hcl::template::Template;
 use std::str::FromStr;
 
 /// Parse an HCL template.
-/// 
+///
 /// # Errors
 /// - cannot parse template
 /// - cannot evaluate template

andax/Cargo.toml

@@ -21,5 +21,4 @@ anda-config = { version = "0.1.6", path = "../anda-config" }
 rhai-fs = "0.1.2"
 rhai-url = "0.0.2"
 hcl-rs = "0.14.0"
-serde-value-flatten = "0.1.0"
 directories = "5.0.1"

andax/src/error.rs

@@ -59,7 +59,7 @@ where
     }
 }
 
-pub const EARTH: &str = r#"
+pub const EARTH: &str = r"
 .    .    *  .   .  .   .  *     .  .        . .   .     .  *   .     .  .   .
    *  .    .    *  .     .         .    * .     .  *  .    .   .   *   . .    .
 . *      .   .    .  .     .  *      .      .        .     .-o--.   .    *  .
@@ -84,4 +84,4 @@ ____   *   .    .      .   .           .  .   .      .    : O. Oo;    .   .
     |                                              `._\-'  '     .        .  .
     |                                                 `.__, \  *     .   . *. .
     |                                                      \ \.    .         .
-    |                                                       \ \ .     * jrei  *"#;
+    |                                                       \ \ .     * jrei  *";

andax/src/fns/io.rs

@@ -51,7 +51,7 @@ pub mod ar {
     pub fn sh_rc(o: (i32, String, String)) -> i32 {
         o.0
     }
-    /// get stdout from the return value of `sh()` 
+    /// get stdout from the return value of `sh()`
     #[rhai_fn(global)]
     pub fn sh_stdout(o: (i32, String, String)) -> String {
         o.1

andax/src/fns/rpm.rs

@@ -3,7 +3,7 @@ use std::{
     fs,
     path::{Path, PathBuf},
 };
-use tracing::{info, error};
+use tracing::{error, info};
 
 lazy_static::lazy_static! {
     static ref RE_RELEASE: regex::Regex = regex::Regex::new(r"Release:(\s+)(.+?)\n").unwrap();
@@ -30,6 +30,9 @@ pub struct RPMSpec {
 
 impl RPMSpec {
     /// Creates a new RPMSpec file representation
+    ///
+    /// # Panics
+    /// - spec file does not exist / cannot read spec to string
     pub fn new<T, U>(name: String, chkupdate: T, spec: U) -> Self
     where
         T: Into<PathBuf> + AsRef<Path>,
@@ -57,7 +60,9 @@ impl RPMSpec {
     }
     /// Sets the version in the spec file
     pub fn version(&mut self, ver: &str) {
-        let Some(m) = RE_VERSION.captures(self.f.as_str()) else { return error!("No `Version:` preamble for {}", self.name) };
+        let Some(m) = RE_VERSION.captures(self.f.as_str()) else {
+            return error!("No `Version:` preamble for {}", self.name);
+        };
         let ver = ver.strip_prefix('v').unwrap_or(ver).replace('-', ".");
         if ver != m[2] {
             info!("{}: {} —→ {ver}", self.name, &m[2]);
@@ -67,20 +72,26 @@ impl RPMSpec {
     }
     /// Change the value of a `%define` macro by the name
     pub fn define(&mut self, name: &str, val: &str) {
-        let Some(cap) = RE_DEFINE.captures_iter(self.f.as_str()).find(|cap| &cap[2] == name) else { return error!("No `Version:` preamble for {}", self.name) };
+        let Some(cap) = RE_DEFINE.captures_iter(self.f.as_str()).find(|cap| &cap[2] == name) else {
+            return error!("No `Version:` preamble for {}", self.name);
+        };
         self.f = self.f.replace(&cap[0], &format!("%define{}{name}{}{val}", &cap[1], &cap[3]));
         self.changed = true;
     }
     /// Change the value of a `%global` macro by the name
     pub fn global(&mut self, name: &str, val: &str) {
-        let Some(cap) = RE_GLOBAL.captures_iter(self.f.as_str()).find(|cap| &cap[2] == name)  else { return error!("No `Version:` preamble for {}", self.name) };
+        let Some(cap) = RE_GLOBAL.captures_iter(self.f.as_str()).find(|cap| &cap[2] == name) else {
+            return error!("No `Version:` preamble for {}", self.name);
+        };
         self.f = self.f.replace(&cap[0], &format!("%global{}{name}{}{val}", &cap[1], &cap[3]));
         self.changed = true;
     }
     /// Change the `SourceN:` preamble value by `N`
     pub fn source(&mut self, i: i64, p: &str) {
         let si = i.to_string();
-        let Some(cap) = RE_SOURCE.captures_iter(self.f.as_str()).find(|cap| cap[1] == si) else { return error!("No `Source{i}:` preamble for {}", self.name)};
+        let Some(cap) = RE_SOURCE.captures_iter(self.f.as_str()).find(|cap| cap[1] == si) else {
+            return error!("No `Source{i}:` preamble for {}", self.name);
+        };
         info!("{}: Source{i}: {p}", self.name);
         self.f = self.f.replace(&cap[0], &format!("Source{i}:{}{p}\n", &cap[2]));
         self.changed = true;

andax/src/lib.rs

@@ -1,5 +1,5 @@
 //! AndaX, an embedded scripting system powered by Rhai.
-//! 
+//!
 //! To start running a script, use `run()`.
 #![warn(clippy::pedantic)]
 #![warn(clippy::nursery)]

src/util.rs

@@ -1,13 +1,14 @@
 //! Utility functions and types
 use anda_config::{Docker, DockerImage, Manifest, Project, RpmBuild};
+use clap_verbosity_flag::LevelFilter;
 use color_eyre::{eyre::eyre, Result};
 use console::style;
-use cmd_lib::log::{debug, info, LevelFilter};
 use nix::{sys::signal, unistd::Pid};
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 use std::{collections::BTreeMap, path::Path};
 use tokio::{io::AsyncBufReadExt, process::Command};
+use tracing::{debug, info};
 
 lazy_static::lazy_static! {
     static ref BUILDARCH_REGEX: Regex = Regex::new("BuildArch:\\s*(.+)").unwrap();
@@ -44,7 +45,7 @@ pub fn fetch_build_entries(config: Manifest) -> Vec<BuildEntry> {
 
         if let Some(rpm) = project.rpm {
             if rpm.enable_scm.unwrap_or(false) {
-                for arch in DEFAULT_ARCHES.iter() {
+                for arch in &*DEFAULT_ARCHES {
                     entries.push(BuildEntry { pkg: std::mem::take(&mut name), arch: arch.clone() });
                 }
                 continue;