From 328f5237047d2ad428e340886fb6e83e67002b14 Mon Sep 17 00:00:00 2001 From: Lleyton Gray Date: Mon, 26 Feb 2024 02:21:45 -0800 Subject: [PATCH] chore: upgrade deps --- Cargo.lock | 79 +++++++++++++++++++++++++++------------- Cargo.toml | 4 +- anda-config/Cargo.toml | 2 +- andax/Cargo.toml | 4 +- andax/src/fns/build.rs | 4 +- andax/src/fns/cfg.rs | 6 +-- andax/src/fns/io.rs | 6 +-- andax/src/fns/kokoro.rs | 6 +-- andax/src/fns/tenshi.rs | 6 +-- andax/src/fns/tsunagu.rs | 6 +-- 10 files changed, 76 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d17992..bfe3a6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,7 +60,7 @@ dependencies = [ "ignore", "itertools", "lazy_static", - "nix 0.26.4", + "nix 0.28.0", "promptly", "regex", "serde", @@ -68,7 +68,7 @@ dependencies = [ "tempfile", "tokio", "tracing", - "tracing-log 0.1.4", + "tracing-log", "tracing-subscriber", "walkdir", ] @@ -79,7 +79,7 @@ version = "0.1.6" dependencies = [ "chrono", "dotenv", - "env_logger", + "env_logger 0.11.2", "hcl-rs", "ignore", "num", @@ -282,6 +282,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chrono" version = "0.4.34" @@ -384,7 +390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5f4cbdcab51ca635c5b19c85ece4072ea42e0d2360242826a6fc96fb11f0d40" dependencies = [ "cmd_lib_macros", - "env_logger", + "env_logger 0.10.2", "faccess", "lazy_static", "log", @@ -610,6 +616,16 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + [[package]] name = "env_logger" version = "0.10.2" @@ -623,6 +639,19 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -1128,12 +1157,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "cfg-if", + "cfg_aliases", "libc", ] @@ -1502,9 +1532,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rhai" -version = "1.16.3" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3625f343d89990133d013e39c46e350915178cf94f1bec9f49b0cbef98a3e3c" +checksum = "f6273372244d04a8a4b0bec080ea1e710403e88c5d9d83f9808b2bfa64f0982a" dependencies = [ "ahash", "bitflags 2.4.2", @@ -1515,6 +1545,7 @@ dependencies = [ "serde", "smallvec", "smartstring", + "thin-vec", ] [[package]] @@ -1530,9 +1561,9 @@ dependencies = [ [[package]] name = "rhai-url" -version = "0.0.2" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74428be7868582fb0ddd07634132234a769dd2c45413b6e35b37c4bc774c225a" +checksum = "e2de48c06355410886a07e47691db696438b784788ef800ef7ca19ac78447964" dependencies = [ "rhai", "serde", @@ -1542,9 +1573,9 @@ dependencies = [ [[package]] name = "rhai_codegen" -version = "1.6.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853977598f084a492323fe2f7896b4100a86284ee8473612de60021ea341310f" +checksum = "9db7f8dc4c9d48183a17ce550574c42995252b82d267eaca3fcd1b979159856c" dependencies = [ "proc-macro2", "quote", @@ -1843,6 +1874,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" +dependencies = [ + "serde", +] + [[package]] name = "thiserror" version = "1.0.57" @@ -1969,17 +2009,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -2002,7 +2031,7 @@ dependencies = [ "smallvec", "thread_local", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b0a09b2..f984dfe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ exclude = [ clap = { version = "4.5.1", features = ["derive", "env"] } tracing = "0.1" tracing-subscriber = "0.3" -tracing-log = "0.1.3" +tracing-log = "0.2.0" color-eyre = "0.6.2" walkdir = "2.3.2" tempfile = "3.4.0" @@ -32,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 = { version = "0.26.2", features = ["signal"], default-features = false } +nix = { version = "0.28.0", features = ["signal"], default-features = false } git2 = "0.18.2" chrono = "0.4.24" ignore = "0.4.18" diff --git a/anda-config/Cargo.toml b/anda-config/Cargo.toml index 6240c97..d1e18e5 100644 --- a/anda-config/Cargo.toml +++ b/anda-config/Cargo.toml @@ -25,4 +25,4 @@ once_cell = { version = "1.16", default-features = false, features = ["std"] } parking_lot = "0.12.1" [dev-dependencies] -env_logger = "0.10.0" +env_logger = "0.11.2" diff --git a/andax/Cargo.toml b/andax/Cargo.toml index 0e7b420..29151dc 100644 --- a/andax/Cargo.toml +++ b/andax/Cargo.toml @@ -11,7 +11,7 @@ description = "Andaman scripting runtime" serde_json = "~1" regex = "~1" lazy_static = "~1" -rhai = { version = "=1.16", features = ["serde", "internals"] } +rhai = { version = "1.17.1", features = ["serde", "internals"] } ureq = { version = "~2", features = ["json"] } tracing = "0.1.37" color-eyre = "0.6.2" @@ -19,7 +19,7 @@ smartstring = "1.0.1" tempfile = "3.4.0" anda-config = { version = "0.1.6", path = "../anda-config" } rhai-fs = "0.1.2" -rhai-url = "0.0.2" +rhai-url = "0.0.5" hcl-rs = "0.15.0" directories = "5.0.1" chrono = "0.4.31" diff --git a/andax/src/fns/build.rs b/andax/src/fns/build.rs index 8b38bb6..f98bbf6 100644 --- a/andax/src/fns/build.rs +++ b/andax/src/fns/build.rs @@ -2,8 +2,8 @@ //! which implements procedures from building RPMs //! see `anda::rpm_spec.rs` use rhai::plugin::{ - export_module, mem, Dynamic, FnAccess, FnNamespace, ImmutableString, Module, NativeCallContext, - PluginFunction, RhaiResult, TypeId, + export_module, mem, Dynamic, FuncRegistration, ImmutableString, Module, NativeCallContext, + PluginFunc, RhaiResult, TypeId, }; // 正にこうです。 :3 diff --git a/andax/src/fns/cfg.rs b/andax/src/fns/cfg.rs index 862a994..cad3620 100644 --- a/andax/src/fns/cfg.rs +++ b/andax/src/fns/cfg.rs @@ -2,10 +2,10 @@ use crate::error::AndaxRes; use anda_config::load_from_file; use rhai::{ plugin::{ - export_module, mem, Dynamic, FnAccess, FnNamespace, ImmutableString, Module, - NativeCallContext, PluginFunction, RhaiResult, TypeId, + export_module, mem, Dynamic, ImmutableString, Module, NativeCallContext, PluginFunc, + RhaiResult, TypeId, }, - EvalAltResult, + EvalAltResult, FuncRegistration, }; use std::path::PathBuf; diff --git a/andax/src/fns/io.rs b/andax/src/fns/io.rs index bcd5fef..551e92b 100644 --- a/andax/src/fns/io.rs +++ b/andax/src/fns/io.rs @@ -1,10 +1,10 @@ use crate::error::AndaxRes; use rhai::{ plugin::{ - export_module, mem, Dynamic, FnAccess, FnNamespace, ImmutableString, Module, - NativeCallContext, PluginFunction, RhaiResult, TypeId, + export_module, mem, Dynamic, FnNamespace, ImmutableString, Module, NativeCallContext, + PluginFunc, RhaiResult, TypeId, }, - EvalAltResult, + EvalAltResult, FuncRegistration, }; use std::io::Write; use std::process::Command; diff --git a/andax/src/fns/kokoro.rs b/andax/src/fns/kokoro.rs index b71cd80..f98658a 100644 --- a/andax/src/fns/kokoro.rs +++ b/andax/src/fns/kokoro.rs @@ -3,10 +3,10 @@ use crate::run::rf; use regex::Regex; use rhai::{ plugin::{ - export_module, mem, FnAccess, FnNamespace, ImmutableString, Module, NativeCallContext, - PluginFunction, RhaiResult, TypeId, + export_module, mem, FnNamespace, ImmutableString, Module, NativeCallContext, PluginFunc, + RhaiResult, TypeId, }, - Dynamic, EvalAltResult as RhaiE, + Dynamic, EvalAltResult as RhaiE, FuncRegistration, }; type Res = Result>; diff --git a/andax/src/fns/tenshi.rs b/andax/src/fns/tenshi.rs index 5ee266f..2d222c1 100644 --- a/andax/src/fns/tenshi.rs +++ b/andax/src/fns/tenshi.rs @@ -4,10 +4,10 @@ use crate::error::AndaxRes; use rhai::{ plugin::{ - export_module, mem, FnAccess, FnNamespace, ImmutableString, Module, NativeCallContext, - PluginFunction, RhaiResult, TypeId, + export_module, mem, FnNamespace, ImmutableString, Module, NativeCallContext, PluginFunc, + RhaiResult, TypeId, }, - Dynamic, EvalAltResult as RhaiE, + Dynamic, EvalAltResult as RhaiE, FuncRegistration, }; type Res = Result>; diff --git a/andax/src/fns/tsunagu.rs b/andax/src/fns/tsunagu.rs index a4f9b4c..c9890ff 100644 --- a/andax/src/fns/tsunagu.rs +++ b/andax/src/fns/tsunagu.rs @@ -1,10 +1,10 @@ use crate::{error::AndaxRes, run::rf}; use rhai::{ plugin::{ - export_module, mem, Dynamic, EvalAltResult, FnAccess, FnNamespace, ImmutableString, Module, - NativeCallContext, PluginFunction, RhaiResult, TypeId, + export_module, mem, Dynamic, EvalAltResult, FnNamespace, ImmutableString, Module, + NativeCallContext, PluginFunc, RhaiResult, TypeId, }, - CustomType, + CustomType, FuncRegistration, }; use serde_json::Value; use std::env::VarError;