From 091ef5516345b2f8e3c41e20210b42e1396ec04a Mon Sep 17 00:00:00 2001 From: Colin Woodbury Date: Mon, 14 Aug 2023 09:57:39 +0900 Subject: [PATCH] chore: bump dependencies --- rust/Cargo.lock | 272 +++++++------------------ rust/Cargo.toml | 2 +- rust/aura-core/Cargo.toml | 6 +- rust/aura-core/src/aur/dependencies.rs | 4 +- rust/aura-pm/Cargo.toml | 8 +- rust/aura-pm/src/command/aur/build.rs | 4 +- rust/aura-pm/src/error.rs | 2 +- rust/aura-pm/src/localization.rs | 1 + 8 files changed, 93 insertions(+), 206 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 545d15aa0..5843a8728 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bedac9e074b9368777268cff76c02d8b26d3e567642a52379aadd5c5e204e120" dependencies = [ "alpm-sys", - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -93,7 +93,7 @@ dependencies = [ [[package]] name = "aura-core" -version = "0.1.1" +version = "0.1.3" dependencies = [ "alpm", "alpm-utils", @@ -101,7 +101,7 @@ dependencies = [ "from_variants", "itertools", "log", - "nonempty", + "nonempty-collections", "petgraph", "r2d2", "rayon", @@ -114,12 +114,12 @@ dependencies = [ [[package]] name = "aura-pm" -version = "4.0.0-alpha6" +version = "4.0.0-alpha8" dependencies = [ "alpm", "alpm-utils", "aura-core", - "clap 4.2.5", + "clap", "colored", "curl", "from_variants", @@ -128,7 +128,7 @@ dependencies = [ "itertools", "linya", "log", - "nonempty", + "nonempty-collections", "num_cpus", "pacmanconf", "r2d2", @@ -162,6 +162,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "block-buffer" version = "0.10.3" @@ -185,9 +191,12 @@ checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "cc" -version = "1.0.74" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +dependencies = [ + "libc", +] [[package]] name = "cesu8" @@ -209,94 +218,44 @@ checksum = "8628d1f5b9a7b1196ce1aa660e3ba7e2559d350649cbe94993519c127df667f2" [[package]] name = "clap" -version = "3.2.23" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags", - "clap_derive 3.2.18", - "clap_lex 0.2.4", - "indexmap", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819" +checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" dependencies = [ "clap_builder", - "clap_derive 4.2.0", + "clap_derive", "once_cell", ] [[package]] name = "clap_builder" -version = "4.2.5" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab" +checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" dependencies = [ "anstream", "anstyle", - "bitflags", - "clap_lex 0.4.1", + "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.15", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", + "syn 2.0.28", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - -[[package]] -name = "clap_mangen" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "105180c05a72388d5f5e4e4f6c79eecb92497bda749fa8f963a16647c5d5377f" -dependencies = [ - "clap 3.2.23", - "roff", -] +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "clipboard-win" @@ -566,15 +525,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "doc-gen" -version = "0.1.0" -dependencies = [ - "aura-pm", - "clap 3.2.23", - "clap_mangen", -] - [[package]] name = "either" version = "1.8.1" @@ -779,18 +729,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "i18n-config" @@ -878,9 +819,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -911,34 +852,22 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e481ccbe3dea62107216d0d1138bb8ad8e5e5c43009a098bd1990272c497b0" -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes 1.0.10", - "rustix 0.37.7", + "hermit-abi 0.3.2", + "rustix 0.38.8", "windows-sys 0.48.0", ] [[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -986,9 +915,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libz-sys" @@ -1010,9 +939,9 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "linux-raw-sys" -version = "0.3.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "linya" @@ -1087,25 +1016,25 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "static_assertions", ] [[package]] -name = "nonempty" -version = "0.8.0" +name = "nonempty-collections" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f1f8e5676e1a1f2ee8b21f38238e1243c827531c9435624c7bfb305102cee4" +checksum = "86462de76453718760e9eb01f1aa80e9b41a47a9009f917cc57861ea6a4537f9" [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] @@ -1129,9 +1058,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl-probe" @@ -1152,12 +1081,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "pacmanconf" version = "2.0.0" @@ -1244,18 +1167,18 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.25" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5308e8208729c3e1504a6cfad0d5daacc4614c9a2e65d1ea312a34b5cb00fe84" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1329,7 +1252,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1343,17 +1266,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "roff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" - [[package]] name = "rust-embed" -version = "6.6.0" +version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb133b9a38b5543fad3807fb2028ea47c5f2b566f4f5e28a11902f1a358348b6" +checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -1362,22 +1279,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.5.0" +version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4e0f0ced47ded9a68374ac145edd65a6c1fa13a96447b873660b2a568a0fd7" +checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 1.0.109", + "syn 2.0.28", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "7.5.0" +version = "7.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731" +checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" dependencies = [ "sha2", "walkdir", @@ -1395,9 +1312,9 @@ version = "0.35.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "985947f9b6423159c4726323f373be0a21bdb514c5af06a849cb3d2dce2d01e8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno 0.2.8", - "io-lifetimes 0.7.4", + "io-lifetimes", "libc", "linux-raw-sys 0.0.46", "windows-sys 0.36.1", @@ -1405,16 +1322,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.7" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno 0.3.1", - "io-lifetimes 1.0.10", "libc", - "linux-raw-sys 0.3.6", - "windows-sys 0.45.0", + "linux-raw-sys 0.4.5", + "windows-sys 0.48.0", ] [[package]] @@ -1423,7 +1339,7 @@ version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "clipboard-win", "dirs-next", @@ -1611,9 +1527,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -1639,12 +1555,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.37" @@ -1834,9 +1744,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -1878,11 +1788,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "validated" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a4da99f9275c40dce65aa733dd4e493e017be59f31a283e6d00152a6e6b9b7" +checksum = "734f0065f244a3a8db90f1fff5680274f853ad36170c4675d3880f6f992840a9" dependencies = [ - "nonempty", + "nonempty-collections", "rayon", ] @@ -2074,37 +1984,13 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets", ] [[package]] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 37a99505d..7f79799c9 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -7,7 +7,7 @@ members = [ # Ecosystem libraries "r2d2-alpm", # Documentation Generation -"doc-gen" +# "doc-gen" ] [profile.release] diff --git a/rust/aura-core/Cargo.toml b/rust/aura-core/Cargo.toml index a04bb3b61..c0afbae7d 100644 --- a/rust/aura-core/Cargo.toml +++ b/rust/aura-core/Cargo.toml @@ -14,9 +14,9 @@ alpm = "2.2" alpm-utils = "2.0" disown = "1.0" from_variants = "1.0" -itertools = "0.10" +itertools = "0.11" log = "0.4" -nonempty = "0.8" +nonempty-collections = "0.1.1" petgraph = { version = "0.6", default-features = false } r2d2 = "0.8" rayon = "1.7" @@ -24,4 +24,4 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" srcinfo = "1.1" time = { version = "0.3", features = ["serde", "local-offset"] } -validated = { version = "0.3", features = ["rayon"] } +validated = { version = "0.4", features = ["rayon"] } diff --git a/rust/aura-core/src/aur/dependencies.rs b/rust/aura-core/src/aur/dependencies.rs index 1dcbf2e98..d1f24044d 100644 --- a/rust/aura-core/src/aur/dependencies.rs +++ b/rust/aura-core/src/aur/dependencies.rs @@ -4,7 +4,7 @@ use crate::Apply; use alpm::Alpm; use disown::Disown; use log::{debug, info}; -use nonempty::NonEmpty; +use nonempty_collections::NEVec; use petgraph::graph::NodeIndex; use petgraph::Graph; use r2d2::{ManageConnection, Pool}; @@ -31,7 +31,7 @@ pub enum Error { /// An error cloning or pulling a repo. Git(crate::git::Error), /// Multiple errors during concurrent dependency resolution. - Resolutions(Box>>), + Resolutions(Box>>), /// A named dependency does not exist. DoesntExist(String), /// A named dependency of some known package does not exist. diff --git a/rust/aura-pm/Cargo.toml b/rust/aura-pm/Cargo.toml index 5ee67eeeb..7695fa7dc 100644 --- a/rust/aura-pm/Cargo.toml +++ b/rust/aura-pm/Cargo.toml @@ -19,16 +19,16 @@ r2d2-alpm = { version = "0.1", path = "../r2d2-alpm" } alpm = "2.2" alpm-utils = "2.0" -clap = { version = "4.2", features = ["derive"] } +clap = { version = "4.3", features = ["derive"] } colored = "2.0" curl = "0.4" from_variants = "1.0" i18n-embed = { version = "0.13", features = ["fluent-system"] } i18n-embed-fl = "0.6" -itertools = "0.10" +itertools = "0.11" linya = "0.3" log = "0.4" -nonempty = "0.8" +nonempty-collections = "0.1.1" num_cpus = "1.16" pacmanconf = "2.0" r2d2 = "0.8" @@ -44,7 +44,7 @@ time = { version = "0.3", features = ["parsing"] } toml = "0.7" ubyte = "0.10" unic-langid = { version = "0.9", features = ["macros"] } -validated = { version = "0.3", features = ["rayon"] } +validated = { version = "0.4", features = ["rayon"] } webbrowser = "0.8" which = "4.4" diff --git a/rust/aura-pm/src/command/aur/build.rs b/rust/aura-pm/src/command/aur/build.rs index 2ffd022ea..3324046e2 100644 --- a/rust/aura-pm/src/command/aur/build.rs +++ b/rust/aura-pm/src/command/aur/build.rs @@ -6,7 +6,7 @@ use colored::Colorize; use i18n_embed::fluent::FluentLanguageLoader; use i18n_embed_fl::fl; use log::{debug, error, warn}; -use nonempty::NonEmpty; +use nonempty_collections::NEVec; use srcinfo::Srcinfo; use std::ops::Not; use std::path::{Path, PathBuf}; @@ -16,7 +16,7 @@ use validated::Validated; pub(crate) enum Error { Srcinfo(PathBuf, srcinfo::Error), GitDiff(aura_core::git::Error), - CopyBuildFiles(NonEmpty), + CopyBuildFiles(NEVec), Utf8(std::str::Utf8Error), FilenameExtraction(PathBuf), TarballMove(PathBuf), diff --git a/rust/aura-pm/src/error.rs b/rust/aura-pm/src/error.rs index 9450c87a7..c7abf1122 100644 --- a/rust/aura-pm/src/error.rs +++ b/rust/aura-pm/src/error.rs @@ -105,7 +105,7 @@ where deps::Error::R2D2(e) => error!("{e}"), deps::Error::Srcinfo(_, e) => error!("{e}"), deps::Error::Git(e) => e.nested(), - deps::Error::Resolutions(es) => es.iter().for_each(|e| e.nested()), + deps::Error::Resolutions(es) => es.iter().into_iter().for_each(|e| e.nested()), deps::Error::DoesntExist(_) => {} deps::Error::DoesntExistWithParent(_, _) => {} deps::Error::MalformedGraph => {} diff --git a/rust/aura-pm/src/localization.rs b/rust/aura-pm/src/localization.rs index f9dfe34f5..cb998c085 100644 --- a/rust/aura-pm/src/localization.rs +++ b/rust/aura-pm/src/localization.rs @@ -6,6 +6,7 @@ use aura_core::Apply; use i18n_embed::fluent::{fluent_language_loader, FluentLanguageLoader}; use i18n_embed::{I18nEmbedError, LanguageLoader}; use i18n_embed_fl::fl; +use nonempty_collections::*; use rust_embed::RustEmbed; use std::collections::HashMap; use unic_langid::LanguageIdentifier;