From 8085e983ea4889347bde3537c756944c2c4448cd Mon Sep 17 00:00:00 2001 From: brianheineman Date: Fri, 3 Jan 2025 17:34:41 -0700 Subject: [PATCH] chore: update dependencies --- Cargo.lock | 160 +++++++++++++++----------------- Cargo.toml | 26 +++--- rsql_core/src/commands/error.rs | 2 +- 3 files changed, 91 insertions(+), 97 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b7dfa008..a6107baf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -613,9 +613,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", @@ -690,7 +690,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", "url", "walkdir", ] @@ -733,7 +733,7 @@ dependencies = [ "self-replace", "serde", "tempfile", - "thiserror 2.0.9", + "thiserror 2.0.10", "url", ] @@ -1029,7 +1029,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" dependencies = [ "borsh-derive", - "cfg_aliases 0.2.1", + "cfg_aliases", ] [[package]] @@ -1246,12 +1246,6 @@ 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 = "cfg_aliases" version = "0.2.1" @@ -1344,9 +1338,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "9560b07a799281c7e0958b9296854d6fafd4c5f31444a7e5bb1ad6dde5ccf1bd" dependencies = [ "clap_builder", "clap_derive", @@ -1364,9 +1358,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "874e0dd3eb68bf99058751ac9712f622e61e6f393a94f7128fa26e3f02f5c7cd" dependencies = [ "anstream", "anstyle", @@ -1376,9 +1370,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 0.5.0", "proc-macro2", @@ -1394,15 +1388,15 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "clearscreen" -version = "3.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f8c93eb5f77c9050c7750e14f13ef1033a40a0aac70c6371535b6763a01438c" +checksum = "8c41dc435a7b98e4608224bbf65282309f5403719df9113621b30f8b6f74e2f4" dependencies = [ - "nix 0.28.0", + "nix", "terminfo", - "thiserror 1.0.69", - "which 6.0.3", - "winapi", + "thiserror 2.0.10", + "which 7.0.1", + "windows-sys 0.59.0", ] [[package]] @@ -1488,20 +1482,20 @@ dependencies = [ [[package]] name = "config" -version = "0.14.1" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf" +checksum = "3d84f8d224ac58107d53d3ec2b9ad39fd8c8c4e285d3c9cb35485ffd2ca88cb3" dependencies = [ "async-trait", "convert_case", "json5", - "nom", "pathdiff", "ron", - "rust-ini 0.20.0", + "rust-ini 0.21.1", "serde", "serde_json", "toml 0.8.19", + "winnow 0.6.20", "yaml-rust2", ] @@ -2206,6 +2200,12 @@ dependencies = [ "log", ] +[[package]] +name = "env_home" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" + [[package]] name = "env_logger" version = "0.11.5" @@ -2355,7 +2355,7 @@ dependencies = [ "quick-xml 0.37.2", "rayon", "serde", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", ] @@ -2909,7 +2909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bdbbd5bc8c5749697ccaa352fa45aff8730cf21c68029c0eef1ffed7c3d6ba2" dependencies = [ "cfg-if", - "nix 0.29.0", + "nix", "widestring", "windows", ] @@ -3615,7 +3615,7 @@ dependencies = [ "serde", "serde_json", "superboring", - "thiserror 2.0.9", + "thiserror 2.0.10", "zeroize", ] @@ -4235,18 +4235,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", -] - [[package]] name = "nix" version = "0.29.0" @@ -4255,7 +4243,7 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", "memoffset", ] @@ -4886,7 +4874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror 2.0.9", + "thiserror 2.0.10", "ucd-trie", ] @@ -5212,7 +5200,7 @@ dependencies = [ "rayon", "regex", "strum_macros 0.26.4", - "thiserror 2.0.9", + "thiserror 2.0.10", "version_check", "xxhash-rust", ] @@ -5227,7 +5215,7 @@ dependencies = [ "polars-arrow-format", "regex", "simdutf8", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -5711,7 +5699,7 @@ dependencies = [ "tar", "target-triple", "tempfile", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", "tracing-indicatif", "url", @@ -5725,7 +5713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77b908fb41f27a08adec7bd971fb7c52212e5b0743ef70100d97c6c09d48432a" dependencies = [ "anyhow", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -5744,7 +5732,7 @@ dependencies = [ "sqlx 0.8.2", "target-triple", "tempfile", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", "url", @@ -5950,7 +5938,7 @@ dependencies = [ "rustc-hash 2.1.0", "rustls 0.23.20", "socket2", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -5969,7 +5957,7 @@ dependencies = [ "rustls 0.23.20", "rustls-pki-types", "slab", - "thiserror 2.0.9", + "thiserror 2.0.10", "tinyvec", "tracing", "web-time", @@ -5981,7 +5969,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527" dependencies = [ - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", "once_cell", "socket2", @@ -6481,7 +6469,7 @@ dependencies = [ "tempfile", "termbg", "test-log", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", "tracing-appender", @@ -6527,7 +6515,7 @@ dependencies = [ "sqlx 0.7.4", "testcontainers", "testcontainers-modules", - "thiserror 2.0.9", + "thiserror 2.0.10", "tiberius", "tokio", "tokio-postgres", @@ -6561,7 +6549,7 @@ dependencies = [ "tabled", "tempfile", "test-log", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", ] @@ -6651,12 +6639,13 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a" +checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f" dependencies = [ "cfg-if", "ordered-multimap 0.7.3", + "trim-in-place", ] [[package]] @@ -6796,7 +6785,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.29.0", + "nix", "radix_trie", "unicode-segmentation", "unicode-width 0.2.0", @@ -6951,9 +6940,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "indexmap 2.7.0", "itoa", @@ -7946,16 +7935,16 @@ dependencies = [ [[package]] name = "termbg" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03426a16336dea313354e389c5ad318fe7e2fd5fb9b3d3584397e8d586cc5bd1" +checksum = "8bf44577a1adf3dfd7fec3b8763074467e27b2ad35ff9157bc3f0a51bb0a3dd4" dependencies = [ "crossterm 0.28.1", "log", "mockall", "scopeguard", "simplelog", - "thiserror 2.0.9", + "thiserror 2.0.10", "winapi", ] @@ -7970,11 +7959,10 @@ dependencies = [ [[package]] name = "terminfo" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" +checksum = "d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662" dependencies = [ - "dirs 4.0.0", "fnv", "nom", "phf", @@ -8058,11 +8046,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.10", ] [[package]] @@ -8078,9 +8066,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb" dependencies = [ "proc-macro2", "quote", @@ -8215,9 +8203,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[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", @@ -8243,9 +8231,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", @@ -8622,6 +8610,12 @@ dependencies = [ "tracing-log", ] +[[package]] +name = "trim-in-place" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" + [[package]] name = "triomphe" version = "0.1.14" @@ -9047,12 +9041,12 @@ dependencies = [ [[package]] name = "which" -version = "6.0.3" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" +checksum = "fb4a9e33648339dc1642b0e36e21b3385e6148e289226f657c809dee59df5028" dependencies = [ "either", - "home", + "env_home", "rustix", "winsafe", ] @@ -9487,13 +9481,13 @@ dependencies = [ [[package]] name = "yaml-rust2" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" +checksum = "2a1a1c0bc9823338a3bdf8c61f994f23ac004c6fa32c08cd152984499b445e8d" dependencies = [ "arraydeque", "encoding_rs", - "hashlink 0.8.4", + "hashlink 0.9.1", ] [[package]] @@ -9542,7 +9536,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.29.0", + "nix", "ordered-stream", "rand", "serde", @@ -9688,7 +9682,7 @@ dependencies = [ "pbkdf2", "rand", "sha1", - "thiserror 2.0.9", + "thiserror 2.0.10", "time", "zeroize", "zopfli", diff --git a/Cargo.toml b/Cargo.toml index 84ee1836..3bc95d93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,19 +21,19 @@ version = "0.15.2" [workspace.dependencies] ansi_colours = "1.2.3" -anyhow = "1.0.94" +anyhow = "1.0.95" arboard = "3.4.1" -async-trait = "0.1.82" +async-trait = "0.1.85" axoupdater = "0.9.0" base64 = "0.22.1" bit-vec = "0.6.3" calamine = "0.26.1" chrono = "0.4.39" -clap = "4.5.23" +clap = "4.5.24" clap-stdin = "0.5.1" -clearscreen = "3.0.0" -colored = "2.1.0" -config = "0.14.0" +clearscreen = "4.0.1" +colored = "2.2.0" +config = "0.15.4" criterion = "0.5.1" csv = "1.3.1" dark-light = "1.1.1" @@ -51,19 +51,19 @@ jwt-simple = { version = "0.12.11", default-features = false } libsql = "0.5.0" mockall = "0.13.1" num-format = "0.4.4" -os_info = "3.9.0" +os_info = "3.9.1" polars = "0.45.1" polars-sql = "0.45.1" postgresql_embedded = "0.17.3" quick-xml = "0.37.2" regex = "1.11.1" -reqwest = "0.12.8" +reqwest = "0.12.12" rusqlite = "0.30.0" rust_decimal = "1.35.0" rust-i18n = "3.1.2" rustyline = "15.0.0" serde = "1.0.216" -serde_json = "1.0.132" +serde_json = "1.0.135" serde_yaml = "0.9.34" sha2 = "0.10.8" sqlx = "0.7.4" @@ -72,14 +72,14 @@ supports-color = "3.0.2" sys-locale = "0.3.2" syntect = "5.2.0" tabled = "0.17.0" -tempfile = "3.14.0" -termbg = "0.6.1" +tempfile = "3.15.0" +termbg = "0.6.2" test-log = "0.2.16" testcontainers = "0.23.1" testcontainers-modules = "0.11.3" -thiserror = "2.0.6" +thiserror = "2.0.10" tiberius = { version = "0.12.3", default-features = false } -tokio = "1.42.0" +tokio = "1.43.0" tokio-postgres = "0.7.12" tokio-util = "0.7.12" tracing = "0.1.41" diff --git a/rsql_core/src/commands/error.rs b/rsql_core/src/commands/error.rs index 06dd5f27..61f9279a 100644 --- a/rsql_core/src/commands/error.rs +++ b/rsql_core/src/commands/error.rs @@ -60,7 +60,7 @@ mod tests { let error = clearscreen::Error::Io(std_io_error); let io_error = Error::from(error); - assert_eq!(io_error.to_string(), "test"); + assert!(io_error.to_string().contains("test")); } #[test]