extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-11-25 01:33:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump deps and address clippy warnings (#6116)

Browse Source
This commit is contained in:
David Knaack 2024-07-25 22:17:06 +02:00 committed by GitHub
parent eba9748eb1
commit 6806f56c90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 180 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
Cargo.lock generated
View File

@ -149,9 +149,9 @@ dependencies = [
[[package]] [[package]]
name = "async-executor" name = "async-executor"
version = "1.12.0" version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
dependencies = [ dependencies = [
"async-task", "async-task",
"concurrent-queue", "concurrent-queue",
@ -229,14 +229,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
name = "async-signal" name = "async-signal"
version = "0.2.8" version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
dependencies = [ dependencies = [
"async-io", "async-io",
"async-lock", "async-lock",
@ -264,7 +264,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -359,9 +359,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.105" version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5208975e568d83b6b05cc0a063c8e7e9acc2b43bee6da15616a5b73e109d7437" checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
[[package]] [[package]]
name = "cfg-if" name = "cfg-if"
@ -437,7 +437,7 @@ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -792,7 +792,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -1056,7 +1056,7 @@ dependencies = [
"gix-utils", "gix-utils",
"itoa", "itoa",
"thiserror", "thiserror",
"winnow 0.6.13", "winnow 0.6.15",
] ]
[[package]] [[package]]
@ -1109,7 +1109,7 @@ dependencies = [
"smallvec", "smallvec",
"thiserror", "thiserror",
"unicode-bom", "unicode-bom",
"winnow 0.6.13", "winnow 0.6.15",
] ]
[[package]] [[package]]
@ -1279,7 +1279,7 @@ checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -1298,7 +1298,7 @@ dependencies = [
"itoa", "itoa",
"smallvec", "smallvec",
"thiserror", "thiserror",
"winnow 0.6.13", "winnow 0.6.15",
] ]
[[package]] [[package]]
@ -1382,7 +1382,7 @@ dependencies = [
"gix-validate", "gix-validate",
"memmap2", "memmap2",
"thiserror", "thiserror",
"winnow 0.6.13", "winnow 0.6.15",
] ]
[[package]] [[package]]
@ -1444,9 +1444,9 @@ dependencies = [
[[package]] [[package]]
name = "gix-tempfile" name = "gix-tempfile"
version = "14.0.0" version = "14.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3b0e276cd08eb2a22e9f286a4f13a222a01be2defafa8621367515375644b99" checksum = "006acf5a613e0b5cf095d8e4b3f48c12a60d9062aa2b2dd105afaf8344a5600c"
dependencies = [ dependencies = [
"gix-fs", "gix-fs",
"libc", "libc",
@ -1866,7 +1866,7 @@ dependencies = [
"cfg-if", "cfg-if",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -2093,7 +2093,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"libc", "libc",
"redox_syscall 0.5.2", "redox_syscall 0.5.3",
"smallvec", "smallvec",
"windows-targets 0.52.6", "windows-targets 0.52.6",
] ]
@ -2157,7 +2157,7 @@ dependencies = [
"pest_meta", "pest_meta",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -2335,6 +2335,15 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "quick-xml"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.36" version = "1.0.36"
@ -2405,9 +2414,9 @@ dependencies = [
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.5.2" version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
] ]
@ -2514,7 +2523,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde_derive_internals", "serde_derive_internals",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -2564,7 +2573,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -2575,7 +2584,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -2597,7 +2606,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -2632,9 +2641,9 @@ dependencies = [
[[package]] [[package]]
name = "sha1_smol" name = "sha1_smol"
version = "1.0.0" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
[[package]] [[package]]
name = "sha2" name = "sha2"
@ -2755,7 +2764,7 @@ dependencies = [
"indexmap 2.2.6", "indexmap 2.2.6",
"log", "log",
"mockall", "mockall",
"nix 0.28.0", "nix 0.29.0",
"notify-rust", "notify-rust",
"nu-ansi-term", "nu-ansi-term",
"once_cell", "once_cell",
@ -2765,7 +2774,7 @@ dependencies = [
"pest", "pest",
"pest_derive", "pest_derive",
"process_control", "process_control",
"quick-xml", "quick-xml 0.36.1",
"rand", "rand",
"rayon", "rayon",
"regex", "regex",
@ -2789,7 +2798,7 @@ dependencies = [
"urlencoding", "urlencoding",
"versions", "versions",
"which", "which",
"windows", "windows 0.58.0",
"winres", "winres",
"yaml-rust2", "yaml-rust2",
] ]
@ -2836,9 +2845,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.69" version = "2.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2865,8 +2874,8 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871"
dependencies = [ dependencies = [
"quick-xml", "quick-xml 0.31.0",
"windows", "windows 0.56.0",
"windows-version", "windows-version",
] ]
@ -2954,22 +2963,22 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.61" version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [ dependencies = [
"thiserror-impl", "thiserror-impl",
] ]
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.61" version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -3016,9 +3025,9 @@ dependencies = [
[[package]] [[package]]
name = "tinyvec" name = "tinyvec"
version = "1.7.0" version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
dependencies = [ dependencies = [
"tinyvec_macros", "tinyvec_macros",
] ]
@ -3081,7 +3090,7 @@ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned",
"toml_datetime", "toml_datetime",
"winnow 0.6.13", "winnow 0.6.15",
] ]
[[package]] [[package]]
@ -3103,7 +3112,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
@ -3308,7 +3317,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3330,7 +3339,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3394,6 +3403,16 @@ dependencies = [
"windows-targets 0.52.6", "windows-targets 0.52.6",
] ]
[[package]]
name = "windows"
version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
dependencies = [
"windows-core 0.58.0",
"windows-targets 0.52.6",
]
[[package]] [[package]]
name = "windows-core" name = "windows-core"
version = "0.52.0" version = "0.52.0"
@ -3409,9 +3428,22 @@ version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
dependencies = [ dependencies = [
"windows-implement", "windows-implement 0.56.0",
"windows-interface", "windows-interface 0.56.0",
"windows-result", "windows-result 0.1.2",
"windows-targets 0.52.6",
]
[[package]]
name = "windows-core"
version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
dependencies = [
"windows-implement 0.58.0",
"windows-interface 0.58.0",
"windows-result 0.2.0",
"windows-strings",
"windows-targets 0.52.6", "windows-targets 0.52.6",
] ]
@ -3423,7 +3455,18 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
]
[[package]]
name = "windows-implement"
version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.72",
] ]
[[package]] [[package]]
@ -3434,7 +3477,18 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
]
[[package]]
name = "windows-interface"
version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.72",
] ]
[[package]] [[package]]
@ -3446,6 +3500,25 @@ dependencies = [
"windows-targets 0.52.6", "windows-targets 0.52.6",
] ]
[[package]]
name = "windows-result"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-strings"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
dependencies = [
"windows-result 0.2.0",
"windows-targets 0.52.6",
]
[[package]] [[package]]
name = "windows-sys" name = "windows-sys"
version = "0.48.0" version = "0.48.0"
@ -3605,9 +3678,9 @@ dependencies = [
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.6.13" version = "0.6.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -3650,9 +3723,9 @@ dependencies = [
[[package]] [[package]]
name = "zbus" name = "zbus"
version = "4.3.1" version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
dependencies = [ dependencies = [
"async-broadcast", "async-broadcast",
"async-executor", "async-executor",
@ -3688,14 +3761,14 @@ dependencies = [
[[package]] [[package]]
name = "zbus_macros" name = "zbus_macros"
version = "4.3.1" version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
dependencies = [ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
"zvariant_utils", "zvariant_utils",
] ]
@ -3727,14 +3800,14 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]
[[package]] [[package]]
name = "zvariant" name = "zvariant"
version = "4.1.2" version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
dependencies = [ dependencies = [
"endi", "endi",
"enumflags2", "enumflags2",
@ -3745,24 +3818,24 @@ dependencies = [
[[package]] [[package]]
name = "zvariant_derive" name = "zvariant_derive"
version = "4.1.2" version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
dependencies = [ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
"zvariant_utils", "zvariant_utils",
] ]
[[package]] [[package]]
name = "zvariant_utils" name = "zvariant_utils"
version = "2.0.0" version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.69", "syn 2.0.72",
] ]

8
Cargo.toml
View File

@ -23,7 +23,7 @@ license = "ISC"
readme = "README.md" readme = "README.md"
repository = "https://github.com/starship/starship" repository = "https://github.com/starship/starship"
# Note: MSRV is only intended as a hint, and only the latest version is officially supported in starship. # Note: MSRV is only intended as a hint, and only the latest version is officially supported in starship.
rust-version = "1.71" rust-version = "1.74"
description = """ description = """
The minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️ The minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️
""" """
@ -64,7 +64,7 @@ os_info = "3.8.2"
path-slash = "0.2.1" path-slash = "0.2.1"
pest = "2.7.11" pest = "2.7.11"
pest_derive = "2.7.11" pest_derive = "2.7.11"
quick-xml = "0.31.0" quick-xml = "0.36.1"
rand = "0.8.5" rand = "0.8.5"
rayon = "1.10.0" rayon = "1.10.0"
regex = { version = "1.10.5", default-features = false, features = ["perf", "std", "unicode-perl"] } regex = { version = "1.10.5", default-features = false, features = ["perf", "std", "unicode-perl"] }
@ -104,7 +104,7 @@ features = ["preserve_order", "indexmap2"]
deelevate = "0.2.0" deelevate = "0.2.0"
[target.'cfg(windows)'.dependencies.windows] [target.'cfg(windows)'.dependencies.windows]
version = "0.56.0" version = "0.58.0"
features = [ features = [
"Win32_Foundation", "Win32_Foundation",
"Win32_UI_Shell", "Win32_UI_Shell",
@ -114,7 +114,7 @@ features = [
] ]
[target.'cfg(not(windows))'.dependencies] [target.'cfg(not(windows))'.dependencies]
nix = { version = "0.28.0", default-features = false, features = ["feature", "fs", "user"] } nix = { version = "0.29.0", default-features = false, features = ["feature", "fs", "user"] }
[build-dependencies] [build-dependencies]
shadow-rs = { version = "0.30.0", default-features = false } shadow-rs = { version = "0.30.0", default-features = false }

1
src/bug_report.rs
View File

@ -62,6 +62,7 @@ struct Environment {
} }
fn get_pkg_branch_tag() -> &'static str { fn get_pkg_branch_tag() -> &'static str {
#[allow(clippy::const_is_empty)]
if !shadow::TAG.is_empty() { if !shadow::TAG.is_empty() {
return shadow::TAG; return shadow::TAG;
} }

26
src/config.rs
View File

@ -313,7 +313,7 @@ impl Style {
where where
F: FnOnce(&nu_ansi_term::Style) -> nu_ansi_term::Style, F: FnOnce(&nu_ansi_term::Style) -> nu_ansi_term::Style,
{ {
Style { Self {
style: f(&self.style), style: f(&self.style),
..*self ..*self
} }
@ -336,7 +336,7 @@ impl Style {
impl From<nu_ansi_term::Style> for Style { impl From<nu_ansi_term::Style> for Style {
fn from(value: nu_ansi_term::Style) -> Self { fn from(value: nu_ansi_term::Style) -> Self {
Style { Self {
style: value, style: value,
..Default::default() ..Default::default()
} }
@ -345,7 +345,7 @@ impl From<nu_ansi_term::Style> for Style {
impl From<nu_ansi_term::Color> for Style { impl From<nu_ansi_term::Color> for Style {
fn from(value: nu_ansi_term::Color) -> Self { fn from(value: nu_ansi_term::Color) -> Self {
Style { Self {
style: value.into(), style: value.into(),
..Default::default() ..Default::default()
} }
@ -361,8 +361,8 @@ impl From<nu_ansi_term::Color> for Style {
- 'italic' - 'italic'
- 'inverted' - 'inverted'
- 'blink' - 'blink'
- 'prev_fg' (specifies the color should be the previous foreground color) - '`prev_fg`' (specifies the color should be the previous foreground color)
- 'prev_bg' (specifies the color should be the previous background color) - '`prev_bg`' (specifies the color should be the previous background color)
- '<color>' (see the `parse_color_string` doc for valid color strings) - '<color>' (see the `parse_color_string` doc for valid color strings)
*/ */
pub fn parse_style_string(style_string: &str, context: Option<&Context>) -> Option<Style> { pub fn parse_style_string(style_string: &str, context: Option<&Context>) -> Option<Style> {
@ -382,14 +382,14 @@ pub fn parse_style_string(style_string: &str, context: Option<&Context>) -> Opti
}; };
match token.as_str() { match token.as_str() {
"underline" => Some(style.map_style(|s| s.underline())), "underline" => Some(style.map_style(nu_ansi_term::Style::underline)),
"bold" => Some(style.map_style(|s| s.bold())), "bold" => Some(style.map_style(nu_ansi_term::Style::bold)),
"italic" => Some(style.map_style(|s| s.italic())), "italic" => Some(style.map_style(nu_ansi_term::Style::italic)),
"dimmed" => Some(style.map_style(|s| s.dimmed())), "dimmed" => Some(style.map_style(nu_ansi_term::Style::dimmed)),
"inverted" => Some(style.map_style(|s| s.reverse())), "inverted" => Some(style.map_style(nu_ansi_term::Style::reverse)),
"blink" => Some(style.map_style(|s| s.blink())), "blink" => Some(style.map_style(nu_ansi_term::Style::blink)),
"hidden" => Some(style.map_style(|s| s.hidden())), "hidden" => Some(style.map_style(nu_ansi_term::Style::hidden)),
"strikethrough" => Some(style.map_style(|s| s.strikethrough())), "strikethrough" => Some(style.map_style(nu_ansi_term::Style::strikethrough)),
"prev_fg" if col_fg => Some(style.fg(PrevColor::Fg)), "prev_fg" if col_fg => Some(style.fg(PrevColor::Fg)),
"prev_fg" => Some(style.bg(PrevColor::Fg)), "prev_fg" => Some(style.bg(PrevColor::Fg)),

18
src/formatter/string_formatter.rs
View File

@ -102,11 +102,11 @@ impl<'a> StringFormatter<'a> {
/// parameter and returns the one of the following values: /// parameter and returns the one of the following values:
/// ///
/// - `None`: This variable will be reserved for further mappers. If it is `None` when /// - `None`: This variable will be reserved for further mappers. If it is `None` when
/// `self.parse()` is called, it will be dropped. /// `self.parse()` is called, it will be dropped.
/// ///
/// - `Some(Err(StringFormatterError))`: This variable will throws `StringFormatterError` when /// - `Some(Err(StringFormatterError))`: This variable will throws `StringFormatterError` when
/// `self.parse()` is called. Return this if some fatal error occurred and the format string /// `self.parse()` is called. Return this if some fatal error occurred and the format string
/// should not be rendered. /// should not be rendered.
/// ///
/// - `Some(Ok(_))`: The value of this variable will be displayed in the format string. /// - `Some(Ok(_))`: The value of this variable will be displayed in the format string.
/// ///
@ -222,7 +222,7 @@ impl<'a> StringFormatter<'a> {
.par_iter_mut() .par_iter_mut()
.filter(|(_, value)| value.is_none()) .filter(|(_, value)| value.is_none())
.for_each(|(key, value)| { .for_each(|(key, value)| {
*value = mapper(key).map(|var| var.map(std::convert::Into::into)); *value = mapper(key).map(|var| var.map(Into::into));
}); });
self self
} }
@ -486,7 +486,7 @@ mod tests {
let style = Some(Color::Red.bold()); let style = Some(Color::Red.bold());
let formatter = StringFormatter::new(FORMAT_STR).unwrap().map(empty_mapper); let formatter = StringFormatter::new(FORMAT_STR).unwrap().map(empty_mapper);
let result = formatter.parse(style.map(|s| s.into()), None).unwrap(); let result = formatter.parse(style.map(Into::into), None).unwrap();
let mut result_iter = result.iter(); let mut result_iter = result.iter();
match_next!(result_iter, "text", style); match_next!(result_iter, "text", style);
} }
@ -561,9 +561,7 @@ mod tests {
let inner_style = Some(Color::Blue.normal()); let inner_style = Some(Color::Blue.normal());
let formatter = StringFormatter::new(FORMAT_STR).unwrap().map(empty_mapper); let formatter = StringFormatter::new(FORMAT_STR).unwrap().map(empty_mapper);
let result = formatter let result = formatter.parse(outer_style.map(Into::into), None).unwrap();
.parse(outer_style.map(|s| s.into()), None)
.unwrap();
let mut result_iter = result.iter(); let mut result_iter = result.iter();
match_next!(result_iter, "outer ", outer_style); match_next!(result_iter, "outer ", outer_style);
match_next!(result_iter, "middle ", middle_style); match_next!(result_iter, "middle ", middle_style);
@ -619,9 +617,9 @@ mod tests {
let mut segments: Vec<Segment> = Vec::new(); let mut segments: Vec<Segment> = Vec::new();
segments.extend(Segment::from_text(None, "styless")); segments.extend(Segment::from_text(None, "styless"));
segments.extend(Segment::from_text(styled_style.map(|s| s.into()), "styled")); segments.extend(Segment::from_text(styled_style.map(Into::into), "styled"));
segments.extend(Segment::from_text( segments.extend(Segment::from_text(
styled_no_modifier_style.map(|s| s.into()), styled_no_modifier_style.map(Into::into),
"styled_no_modifier", "styled_no_modifier",
)); ));

6
src/module.rs
View File

@ -222,8 +222,10 @@ where
chunks chunks
.into_iter() .into_iter()
.flat_map(|(strs, fill)| { .flat_map(|(strs, fill)| {
let fill_string = let fill_string = fill.ansi_string(
fill.ansi_string(fill_size, strs.last().map(|segment| segment.style_ref())); fill_size,
strs.last().map(nu_ansi_term::AnsiGenericString::style_ref),
);
strs.into_iter().chain(std::iter::once(fill_string)) strs.into_iter().chain(std::iter::once(fill_string))
}) })
.chain(current) .chain(current)

2
src/modules/dotnet.rs
View File

@ -99,7 +99,7 @@ fn find_current_tfm(files: &[DotNetFile]) -> Option<String> {
fn get_tfm_from_project_file(path: &Path) -> Option<String> { fn get_tfm_from_project_file(path: &Path) -> Option<String> {
let project_file = utils::read_file(path).ok()?; let project_file = utils::read_file(path).ok()?;
let mut reader = Reader::from_str(&project_file); let mut reader = Reader::from_str(&project_file);
reader.trim_text(true); reader.config_mut().trim_text(true);
let mut in_tfm = false; let mut in_tfm = false;
let mut buf = Vec::new(); let mut buf = Vec::new();

8
src/modules/kubernetes.rs
View File

@ -115,7 +115,7 @@ impl DataValue for JsonValue {
impl DataValue for Yaml { impl DataValue for Yaml {
fn get(&self, key: &str) -> Option<&Self> { fn get(&self, key: &str) -> Option<&Self> {
match self { match self {
Yaml::Hash(map) => map.get(&Yaml::String(key.to_string())), Self::Hash(map) => map.get(&Self::String(key.to_string())),
_ => None, _ => None,
} }
} }
@ -126,7 +126,7 @@ impl DataValue for Yaml {
fn as_array(&self) -> Option<Vec<&Self>> { fn as_array(&self) -> Option<Vec<&Self>> {
match self { match self {
Yaml::Array(arr) => Some(arr.iter().collect()), Self::Array(arr) => Some(arr.iter().collect()),
_ => None, _ => None,
} }
} }
@ -1567,7 +1567,7 @@ users: []
let actual = results.first().unwrap(); let actual = results.first().unwrap();
match actual { match actual {
Document::Json(..) => {} Document::Json(..) => {}
_ => panic!("Expected Document::Json, got {:?}", actual), _ => panic!("Expected Document::Json, got {actual:?}"),
} }
Ok(()) Ok(())
} }
@ -1598,7 +1598,7 @@ users: []
let actual = results.first().unwrap(); let actual = results.first().unwrap();
match actual { match actual {
Document::Yaml(..) => {} Document::Yaml(..) => {}
_ => panic!("Expected Document::Yaml, got {:?}", actual), _ => panic!("Expected Document::Yaml, got {actual:?}"),
} }
Ok(()) Ok(())
} }

2
src/modules/package.rs
View File

@ -152,7 +152,7 @@ fn get_mix_version(context: &Context, config: &PackageConfig) -> Option<String>
fn get_maven_version(context: &Context, config: &PackageConfig) -> Option<String> { fn get_maven_version(context: &Context, config: &PackageConfig) -> Option<String> {
let file_contents = context.read_file_from_pwd("pom.xml")?; let file_contents = context.read_file_from_pwd("pom.xml")?;
let mut reader = QXReader::from_str(&file_contents); let mut reader = QXReader::from_str(&file_contents);
reader.trim_text(true); reader.config_mut().trim_text(true);
let mut buf = vec![]; let mut buf = vec![];
let mut in_ver = false; let mut in_ver = false;

4
src/modules/utils/directory_nix.rs
View File

@ -10,8 +10,8 @@ use std::path::Path;
/// It extracts Unix access rights from the directory and checks whether /// It extracts Unix access rights from the directory and checks whether
/// 1) the current user is the owner of the directory and whether it has the write access /// 1) the current user is the owner of the directory and whether it has the write access
/// 2) the current user's primary group is the directory group owner whether if it has write access /// 2) the current user's primary group is the directory group owner whether if it has write access
/// 2a) (not implemented on macOS) one of the supplementary groups of the current user is the /// 2a) (not implemented on macOS) one of the supplementary groups of the current user is the
/// directory group owner and whether it has write access /// directory group owner and whether it has write access
/// 3) 'others' part of the access mask has the write access /// 3) 'others' part of the access mask has the write access
#[allow(clippy::useless_conversion)] // On some platforms it is not u32 #[allow(clippy::useless_conversion)] // On some platforms it is not u32
pub fn is_write_allowed(folder_path: &Path) -> Result<bool, String> { pub fn is_write_allowed(folder_path: &Path) -> Result<bool, String> {

4
src/segment.rs
View File

@ -130,8 +130,8 @@ impl Segment {
pub fn style(&self) -> Option<AnsiStyle> { pub fn style(&self) -> Option<AnsiStyle> {
match self { match self {
Self::Fill(fs) => fs.style.map(|cs| cs.to_ansi_style(None).to_owned()), Self::Fill(fs) => fs.style.map(|cs| cs.to_ansi_style(None)),
Self::Text(ts) => ts.style.map(|cs| cs.to_ansi_style(None).to_owned()), Self::Text(ts) => ts.style.map(|cs| cs.to_ansi_style(None)),
Self::LineTerm => None, Self::LineTerm => None,
} }
} }