From b08020949a4b5610a73ffa2a17ba9533b4fcd723 Mon Sep 17 00:00:00 2001 From: Jan Dittrich Date: Tue, 7 Mar 2023 19:34:18 +0000 Subject: [PATCH 01/29] docs(character): use updated `vimcmd_symbol` instead of older `vicmd_symbol` variant (#4960) Fix typo in character example --- docs/config/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config/README.md b/docs/config/README.md index e7e0766be..118baf63f 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -745,7 +745,7 @@ error_symbol = '[➜](bold red) ' # ~/.config/starship.toml [character] -vicmd_symbol = '[V](bold green) ' +vimcmd_symbol = '[V](bold green) ' ``` ## CMake From 0c5b11da122d868de69f34460f610cb33712fdf2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 21:21:21 +0000 Subject: [PATCH 02/29] build(deps): update rust crate serde to 1.0.153 --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be3ca2212..ad461621f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2496,18 +2496,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.152" +version = "1.0.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "3a382c72b4ba118526e187430bb4963cd6d55051ebf13d9b25574d379cc98d20" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "1ef476a5790f0f6decbc66726b6e5d63680ed518283e64c7df415989d880954f" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 5cdc796f2..c5ad0a6fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ rayon = "1.7.0" regex = "1.7.1" rust-ini = "0.18.0" semver = "1.0.16" -serde = { version = "1.0.152", features = ["derive"] } +serde = { version = "1.0.153", features = ["derive"] } serde_json = "1.0.94" sha1 = "0.10.5" shadow-rs = { version = "0.21.0", default-features = false } From 000f5ed10d6f206aadc2a7c69810cb029374d1bf Mon Sep 17 00:00:00 2001 From: Zhizhen He Date: Wed, 8 Mar 2023 23:42:00 +0800 Subject: [PATCH 03/29] docs(install): fix typo and update indentation and whitespaces (#4941) --- install/macos_packages/build_and_notarize.sh | 28 ++++++++--------- .../macos_packages/build_component_package.sh | 10 +++--- .../build_distribution_package.sh | 31 +++++++++---------- install/macos_packages/common.sh | 10 +++--- install/macos_packages/readme.md | 2 +- 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/install/macos_packages/build_and_notarize.sh b/install/macos_packages/build_and_notarize.sh index 1900ed98c..d3f12193e 100644 --- a/install/macos_packages/build_and_notarize.sh +++ b/install/macos_packages/build_and_notarize.sh @@ -2,30 +2,30 @@ set -euo pipefail -# Envrionmental variables that need to be set. These are sane defaults +# Environmental variables that need to be set. These are sane defaults # KEYCHAIN_ENTRY=AC_PASSWORD # Or whatever you picked for # RUNNER_TEMP=~/Library/Keychains/ # KEYCHAIN_FILENAME=login.keychain-db # # Environmental variables that can be set if needed. Else they will default to # values selected for the CI -# +# # The identifier for the application signing key. Can be a name or a fingerprint # APPLICATION_KEY_IDENT=E03290CABE09E9E42341C8FC82608E91241FAD4A # The identifier for the installer signing key. Can be a name or a fingerprint # INSTALLATION_KEY_IDENT=E525359D0B5AE97B7B6F5BB465FEC872C117D681 -usage(){ - echo "Builds, signs, and notarizes starship." - echo "Read readme.md in the script directory to see the assumptions the script makes." - echo "Usage: $0 [pkgname]" - echo " Example: $0 target/release/starship docs/ x64" - echo " Example: $0 target/debug/starship docs/ arm64 starship-1.2.1-arm64.pkg" - echo "" - echo "If no pkgname is provided, the package will be named starship--.pkg" +usage() { + echo "Builds, signs, and notarizes starship." + echo "Read readme.md in the script directory to see the assumptions the script makes." + echo "Usage: $0 [pkgname]" + echo " Example: $0 target/release/starship docs/ x64" + echo " Example: $0 target/debug/starship docs/ arm64 starship-1.2.1-arm64.pkg" + echo "" + echo "If no pkgname is provided, the package will be named starship--.pkg" } -script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" source "$script_dir/common.sh" if [[ -z ${KEYCHAIN_ENTRY+x} ]]; then @@ -56,8 +56,8 @@ if [[ -z ${INSTALLATION_KEY_IDENT+x} ]]; then fi if [[ -z ${3+x} ]]; then - usage - exit 1 + usage + exit 1 fi starship_binary="$1" @@ -112,4 +112,4 @@ if [ "$pkgname" = "" ]; then fi echo ">>>> Placing final output at $pkgname" -mv starship.pkg "$pkgname" \ No newline at end of file +mv starship.pkg "$pkgname" diff --git a/install/macos_packages/build_component_package.sh b/install/macos_packages/build_component_package.sh index 000c08f66..634f9f4d3 100644 --- a/install/macos_packages/build_component_package.sh +++ b/install/macos_packages/build_component_package.sh @@ -8,7 +8,7 @@ set -euo pipefail # Usage: run this script, passing $1 to the repository path. The script assumes # it is being run from within a starship repository if $1 is not provided. -usage(){ +usage() { echo "Builds a component package for macOS." echo "Assumes that the following items already exist:" echo " - A starship binary which has already been notarized" @@ -17,10 +17,10 @@ usage(){ echo "Usage: $0 " } -script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" source "$script_dir/common.sh" -cleanup_server(){ +cleanup_server() { if [[ -n "${server_pid-}" ]]; then echo "Killing HTTP server ($server_pid) to clean up." kill "$server_pid" @@ -77,7 +77,7 @@ sleep 3 # on MacOS by default, but lucky for us, it does exist on GHActions runners. # Wget may return nonzero exit codes even if things were mostly fine (e.g. 404 for # some links on translated pages) so we simply ignore if it has a failure -wget --mirror --convert-links --adjust-extension --page-requisites --no-parent 127.0.0.1:8000 &> wget.log || true +wget --mirror --convert-links --adjust-extension --page-requisites --no-parent 127.0.0.1:8000 &>wget.log || true mkdir -p "$pkgdir/usr/local/share/doc/" mv 127.0.0.1:8000 "$pkgdir/usr/local/share/doc/starship" @@ -87,4 +87,4 @@ trap - INT # Build the component package version="$(starship_version "$starship_program_file")" -pkgbuild --identifier com.starshipprompt.starship --version "$version" --root $pkgdir starship-component.pkg \ No newline at end of file +pkgbuild --identifier com.starshipprompt.starship --version "$version" --root $pkgdir starship-component.pkg diff --git a/install/macos_packages/build_distribution_package.sh b/install/macos_packages/build_distribution_package.sh index 54b4ef89d..4d3368c66 100644 --- a/install/macos_packages/build_distribution_package.sh +++ b/install/macos_packages/build_distribution_package.sh @@ -4,25 +4,25 @@ component_package="$1" resources="$2" arch="$3" -usage(){ - echo "Builds a distribution package for macOS." - echo "Assumes that the following items already exist:" - echo " - A starship component package" - echo " - Resources in a pkg_resources directory" - echo "Usage: $0 " - echo " where arch is one of \"arm64\" or \"x86_64\"" +usage() { + echo "Builds a distribution package for macOS." + echo "Assumes that the following items already exist:" + echo " - A starship component package" + echo " - Resources in a pkg_resources directory" + echo "Usage: $0 " + echo " where arch is one of \"arm64\" or \"x86_64\"" } -script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" source "$script_dir/common.sh" if [[ "$OSTYPE" != 'darwin'* ]]; then - error "This script only works on MacOS" + error "This script only works on MacOS" fi if [[ "${3-undefined}" = "undefined" ]]; then - usage - exit 1 + usage + exit 1 fi # Generate a distribution file with the appropriate architecture plists @@ -40,8 +40,7 @@ productbuild --synthesize --package starship-component.pkg --product "$archplist # search for a line that matches our opening tag and insert our desired lines after it # Solution taken from https://www.theunixschool.com/2012/06/insert-line-before-or-after-pattern.html -while read -r line -do +while read -r line; do echo "$line" if echo "$line" | grep -qF '' @@ -49,10 +48,10 @@ do echo '' echo '' fi -done < starship_raw.dist > starship.dist +done starship.dist # The above script does not correctly take care of the last line. Apply fixup. -echo '' >> starship.dist +echo '' >>starship.dist echo "Creating distribution package with following distribution file:" cat starship.dist @@ -64,4 +63,4 @@ echo "Component package is $component_package" productbuild --distribution starship.dist --resources "$resources" --package-path "$component_package" starship-unsigned.pkg # Clean up the distribution files -rm -- *.dist \ No newline at end of file +rm -- *.dist diff --git a/install/macos_packages/common.sh b/install/macos_packages/common.sh index 9a9c8503d..f69d05d04 100644 --- a/install/macos_packages/common.sh +++ b/install/macos_packages/common.sh @@ -1,17 +1,17 @@ #!/bin/bash -error(){ - echo "[ERROR]: $1" - exit 1 +error() { + echo "[ERROR]: $1" + exit 1 } -starship_version(){ +starship_version() { starship_program_file="$1" # Check if this is a relative path: if so, prepend './' to it if [ "$1" = "${1#/}" ]; then starship_program_file="./$starship_program_file" fi - if "$starship_program_file" -V 2>&1 > /dev/null; then + if "$starship_program_file" -V 2>&1 >/dev/null; then "$starship_program_file" -V | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+' else # try to get this information from Cargo.toml diff --git a/install/macos_packages/readme.md b/install/macos_packages/readme.md index c56f84c33..07cfac333 100644 --- a/install/macos_packages/readme.md +++ b/install/macos_packages/readme.md @@ -138,7 +138,7 @@ attempts, run xcrun notarytool history --keychain-profile "AC_PASSWORD" ``` -Find the `id` of the attempt you wish to view, then run one of these commmands: +Find the `id` of the attempt you wish to view, then run one of these commands: ``` xcrun notarytool info --keychain-profile "AC_PASSWORD" From 55fa90c004afcdba33788d4d2ab94fa48f8bb35c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 20:34:28 +0000 Subject: [PATCH 04/29] build(deps): update rust crate serde to 1.0.154 --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad461621f..19c20314f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2496,18 +2496,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.153" +version = "1.0.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a382c72b4ba118526e187430bb4963cd6d55051ebf13d9b25574d379cc98d20" +checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.153" +version = "1.0.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef476a5790f0f6decbc66726b6e5d63680ed518283e64c7df415989d880954f" +checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index c5ad0a6fe..1fafc5664 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ rayon = "1.7.0" regex = "1.7.1" rust-ini = "0.18.0" semver = "1.0.16" -serde = { version = "1.0.153", features = ["derive"] } +serde = { version = "1.0.154", features = ["derive"] } serde_json = "1.0.94" sha1 = "0.10.5" shadow-rs = { version = "0.21.0", default-features = false } From 06ddab7e36207758a859184b1f2c7f52649bee59 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Mar 2023 07:44:11 +0000 Subject: [PATCH 05/29] build(deps): update rust crate gix to 0.40.0 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 19c20314f..0beafee0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -836,9 +836,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.39.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabfac58aecb4a38cdd2568de66eb1f0d968fd6726f5a80cb8bea7944ef10cc0" +checksum = "cba77ff867378bb250c11a89724e42436a4ac48e2ad2a21dbb4c9ff227e92f2c" dependencies = [ "gix-actor", "gix-attributes", diff --git a/Cargo.toml b/Cargo.toml index 1fafc5664..2fadf482a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ dirs-next = "2.0.0" dunce = "1.0.3" gethostname = "0.4.1" # default feature restriction addresses https://github.com/starship/starship/issues/4251 -gix = { version = "0.39.0", default-features = false, features = ["max-performance-safe"] } +gix = { version = "0.40.0", default-features = false, features = ["max-performance-safe"] } gix-features = { version = "0.28.0", optional = true } indexmap = { version = "1.9.2", features = ["serde"] } log = { version = "0.4.17", features = ["std"] } From c8520dc9d9a89a0e731577518ec0a51203f4fc48 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Sat, 11 Mar 2023 15:23:30 +0900 Subject: [PATCH 06/29] chore: fix clippy warnings for rust 1.68 (#4983) --- src/modules/nim.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/nim.rs b/src/modules/nim.rs index b08a71f5f..844c37a12 100644 --- a/src/modules/nim.rs +++ b/src/modules/nim.rs @@ -64,7 +64,7 @@ fn parse_nim_version(version_cmd_output: &str) -> Option<&str> { // First line has the version .next()? .split(' ') - .find(|&s| s.chars().all(|c| ('0'..='9').contains(&c) || c == '.')) + .find(|&s| s.chars().all(|c| c.is_ascii_digit() || c == '.')) } #[cfg(test)] From 0ad0465a7a3296b3223693c655f370b7aae0d441 Mon Sep 17 00:00:00 2001 From: Swarnim Maheshwari Date: Sat, 11 Mar 2023 11:54:14 +0530 Subject: [PATCH 07/29] fix(init): avoid cygpath for starship binary path (#4970) Update mod.rs --- src/init/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/init/mod.rs b/src/init/mod.rs index 514398936..f0b247c90 100644 --- a/src/init/mod.rs +++ b/src/init/mod.rs @@ -169,7 +169,7 @@ pub fn init_stub(shell_name: &str) -> io::Result<()> { "ion" => print!("eval $({} init ion --print-full-init)", starship.sprint()?), "elvish" => print!( r#"eval ({} init elvish --print-full-init | slurp)"#, - starship.sprint_posix()? + starship.sprint()? ), "tcsh" => print!( r#"eval `({} init tcsh --print-full-init)`"#, From cb164cf04cac82808b5e78a8506ed46754e8cd19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Mar 2023 10:43:01 +0100 Subject: [PATCH 08/29] build(deps): update rust crate open to v4 (#4982) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0beafee0e..c6e4fea75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1899,9 +1899,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "3.4.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ecf2487e799604735754d2c5896106785987b441b5aee58f242e4d4963179a" +checksum = "bd61e3bf9d78956c72ee864bba52431f7f43994b21a17e9e72596a81bd61075b" dependencies = [ "pathdiff", ] diff --git a/Cargo.toml b/Cargo.toml index 2fadf482a..6bc762b0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ log = { version = "0.4.17", features = ["std"] } notify-rust = { version = "4.8.0", optional = true } nu-ansi-term = "0.46.0" once_cell = "1.17.1" -open = "3.4.0" +open = "4.0.0" # update os module config and tests when upgrading os_info os_info = "3.6.0" path-slash = "0.2.1" From 01d4ce18bcb2bf6687483f0f1bf53f2082ce6914 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Mar 2023 06:27:51 +0000 Subject: [PATCH 09/29] build(deps): update rust crate toml_edit to 0.19.5 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c6e4fea75..e2e307199 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3026,9 +3026,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.4" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" +checksum = "7082a95d48029677a28f181e5f6422d0c8339ad8396a39d3f33d62a90c1f6c30" dependencies = [ "indexmap", "serde", diff --git a/Cargo.toml b/Cargo.toml index 6bc762b0e..d88229f95 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,7 +81,7 @@ strsim = "0.10.0" systemstat = "=0.2.3" terminal_size = "0.2.5" toml = { version = "0.7.2", features = ["preserve_order"] } -toml_edit = "0.19.4" +toml_edit = "0.19.5" unicode-segmentation = "1.10.1" unicode-width = "0.1.10" urlencoding = "2.1.2" From d902ef2b4be708736af30fec2d21c1a3656791c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Mar 2023 10:43:42 +0100 Subject: [PATCH 10/29] build(deps): update rust crate gix to 0.41.0 (#4984) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Cargo.lock | 48 ++++++++++++++++++++++++------------------------ Cargo.toml | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e2e307199..ae4cfa604 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -836,9 +836,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cba77ff867378bb250c11a89724e42436a4ac48e2ad2a21dbb4c9ff227e92f2c" +checksum = "b1853c840375a04e02315cb225b6d802291abfabbf08e500727c98a8670f1bf1" dependencies = [ "gix-actor", "gix-attributes", @@ -934,9 +934,9 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c62e26ce11f607712e4f49a0a192ed87675d30187fd61be070abbd607d12f1" +checksum = "6aa7d7dd60256b7a0c0506a1d708ec92767c2662ee57b3301b538eaa3e064f8a" dependencies = [ "bstr", "gix-config-value", @@ -968,9 +968,9 @@ dependencies = [ [[package]] name = "gix-credentials" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be32b5fe339a31b8e53fa854081dc914c45020dcb64637f3c21baf69c96fc1b" +checksum = "750b684197374518ea057e0a0594713e07683faa0a3f43c0f93d97f64130ad8d" dependencies = [ "bstr", "gix-command", @@ -1008,9 +1008,9 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c204adba5ebd211c74735cbb65817d277e154486bac0dffa3701f163b80350" +checksum = "1b58931ab475a977deff03417e041a66e4bcb76c4e5797e7ec2fcb272ebce01c" dependencies = [ "bstr", "dunce", @@ -1075,9 +1075,9 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12caf7886c7ba06f2b28835cdc2be1dca86bd047d00299d2d49e707ce1c2616" +checksum = "546ee7855d5d8731288f05a63c07ab41b59cb406660a825ed3fe89d7223823df" dependencies = [ "bitflags", "bstr", @@ -1097,9 +1097,9 @@ dependencies = [ [[package]] name = "gix-lock" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66119ff8a4a395d0ea033fef718bc85f8b4f0855874f4ce1e005fc16cfe1f66e" +checksum = "41b80172055c5d8017a48ddac5cc7a95421c00211047db0165c97853c4f05194" dependencies = [ "fastrand", "gix-tempfile", @@ -1138,9 +1138,9 @@ dependencies = [ [[package]] name = "gix-odb" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a5f9e1afbd509761977a2ea02869cedaaba500b4e783deb2e4de5179a55a80" +checksum = "aa63fce01e5bce663bb24ad01fa2b77266e91b1d1982aab3f67cb0aed8af8169" dependencies = [ "arc-swap", "gix-features", @@ -1156,9 +1156,9 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51db84e1459a8022e518d40a8778028d793dbb28e4d35c9a5eaf92658fb0775" +checksum = "66bc9d22f0d0620d013003ab05ead5c60124b6e1101bc245be9be4fd7e2330cb" dependencies = [ "clru", "gix-chunk", @@ -1213,9 +1213,9 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a0ed29e581f04b904ecd0c32b11f33b8209b5a0af9c43f415249a4f2fba632" +checksum = "3de7cd1050fa82be4240994defc1f1f2fd9def5d8815dcd005f5ddc5e3dc7511" dependencies = [ "gix-actor", "gix-features", @@ -1273,9 +1273,9 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "4.1.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e0227bd284cd16105e8479602bb8af6bddcb800427e881c1feee4806310a31" +checksum = "743bae41b5db7f085dc7acc54ed72c98853a6e5dabb355e95caa7b534f21b35c" dependencies = [ "libc", "once_cell", @@ -1299,9 +1299,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044072b7ce8601b62dcec841b92129f5cc677072823324121b395d766ac5f528" +checksum = "b6a22b4b32ad14d68f7b7fb6458fa58d44b01797d94c1b8f4db2d9c7b3c366b5" dependencies = [ "bstr", "gix-features", @@ -1323,9 +1323,9 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cb9af6e56152953d8fe113c4f9d7cf60cf7a982362711e9200a255579b49cb" +checksum = "992b8fdade33e079dc61c29f2388ab8e049965ebf7be40efa7f8b80e3c4543fe" dependencies = [ "bstr", "gix-attributes", diff --git a/Cargo.toml b/Cargo.toml index d88229f95..7bc2b32e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ dirs-next = "2.0.0" dunce = "1.0.3" gethostname = "0.4.1" # default feature restriction addresses https://github.com/starship/starship/issues/4251 -gix = { version = "0.40.0", default-features = false, features = ["max-performance-safe"] } +gix = { version = "0.41.0", default-features = false, features = ["max-performance-safe"] } gix-features = { version = "0.28.0", optional = true } indexmap = { version = "1.9.2", features = ["serde"] } log = { version = "0.4.17", features = ["std"] } From 93dbb6fd4d3e1e528e46dd9a7764ef359cb81302 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 00:33:54 +0000 Subject: [PATCH 11/29] build(deps): update rust crate serde to 1.0.155 --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae4cfa604..0d7aaaae2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2496,18 +2496,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.154" +version = "1.0.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e" +checksum = "71f2b4817415c6d4210bfe1c7bfcf4801b2d904cb4d0e1a8fdb651013c9e86b8" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.154" +version = "1.0.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217" +checksum = "d071a94a3fac4aff69d023a7f411e33f40f3483f8c5190b1953822b6b76d7630" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 7bc2b32e1..639bdd0ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ rayon = "1.7.0" regex = "1.7.1" rust-ini = "0.18.0" semver = "1.0.16" -serde = { version = "1.0.154", features = ["derive"] } +serde = { version = "1.0.155", features = ["derive"] } serde_json = "1.0.94" sha1 = "0.10.5" shadow-rs = { version = "0.21.0", default-features = false } From ee2f964e1dffce388ea1a907ea17f292c9515a20 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 20:58:28 +0000 Subject: [PATCH 12/29] build(deps): update rust crate chrono to 0.4.24 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d7aaaae2..1199a2f69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -251,9 +251,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index 639bdd0ad..6e5b4960c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ gix-max-perf = ["gix-features/zlib-ng", "gix/fast-sha1"] gix-faster = ["gix-features/zlib-stock", "gix/fast-sha1"] [dependencies] -chrono = { version = "0.4.23", default-features = false, features = ["clock", "std", "wasmbind"] } +chrono = { version = "0.4.24", default-features = false, features = ["clock", "std", "wasmbind"] } clap = { version = "4.1.8", features = ["derive", "cargo", "unicode"] } clap_complete = "4.1.4" dirs-next = "2.0.0" From 3d474684149e0a7959fb986f8cea1d28b4c69d87 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 Mar 2023 21:02:20 +0000 Subject: [PATCH 13/29] build(deps): update rust crate semver to 1.0.17 --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1199a2f69..a30a63889 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2481,9 +2481,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "semver-parser" @@ -2728,7 +2728,7 @@ dependencies = [ "regex", "rust-ini", "schemars", - "semver 1.0.16", + "semver 1.0.17", "serde", "serde_json", "sha1", diff --git a/Cargo.toml b/Cargo.toml index 6e5b4960c..2a75a8a0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ rand = "0.8.5" rayon = "1.7.0" regex = "1.7.1" rust-ini = "0.18.0" -semver = "1.0.16" +semver = "1.0.17" serde = { version = "1.0.155", features = ["derive"] } serde_json = "1.0.94" sha1 = "0.10.5" From a47e0ce3d2c6bd3a9d3e95aaf5bda4cba9b59053 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 19:20:32 +0000 Subject: [PATCH 14/29] build(deps): update rust crate quick-xml to 0.28.0 --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a30a63889..dc442dac0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2238,9 +2238,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +checksum = "7a306703b4ad75d304a1bbc17d91d4399993caa163ad5028ffb044e5152ffcdd" dependencies = [ "memchr", ] @@ -2722,7 +2722,7 @@ dependencies = [ "pest", "pest_derive", "process_control", - "quick-xml 0.27.1", + "quick-xml 0.28.0", "rand 0.8.5", "rayon", "regex", diff --git a/Cargo.toml b/Cargo.toml index 2a75a8a0e..42cac2cbd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ os_info = "3.6.0" path-slash = "0.2.1" pest = "2.5.6" pest_derive = "2.5.6" -quick-xml = "0.27.1" +quick-xml = "0.28.0" rand = "0.8.5" rayon = "1.7.0" regex = "1.7.1" From a903c95da621f96cea2c472077498fb808a340aa Mon Sep 17 00:00:00 2001 From: Matan Kushner Date: Tue, 14 Mar 2023 10:28:09 +0900 Subject: [PATCH 15/29] Update sponsors --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 44e9466a4..39f02db6e 100644 --- a/README.md +++ b/README.md @@ -424,7 +424,6 @@ Support this project by [becoming a sponsor](https://github.com/sponsors/starshi **Supporter Tier** -- [Dimension](https://dimension.dev/) - [Appwrite](https://appwrite.io/)

From e2608cab6433fcc2cedd8e7384e025b2a5f28f2b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 19:16:48 +0000 Subject: [PATCH 16/29] build(deps): update toml crates --- Cargo.lock | 10 +++++----- Cargo.toml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc442dac0..96fa6dbab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2739,7 +2739,7 @@ dependencies = [ "systemstat", "tempfile", "terminal_size", - "toml 0.7.2", + "toml 0.7.3", "toml_edit", "unicode-segmentation", "unicode-width", @@ -3004,9 +3004,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ "indexmap", "serde", @@ -3026,9 +3026,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.5" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7082a95d48029677a28f181e5f6422d0c8339ad8396a39d3f33d62a90c1f6c30" +checksum = "08de71aa0d6e348f070457f85af8bd566e2bc452156a423ddf22861b3a953fae" dependencies = [ "indexmap", "serde", diff --git a/Cargo.toml b/Cargo.toml index 42cac2cbd..4af764985 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,8 +80,8 @@ starship-battery = { version = "0.7.9", optional = true } strsim = "0.10.0" systemstat = "=0.2.3" terminal_size = "0.2.5" -toml = { version = "0.7.2", features = ["preserve_order"] } -toml_edit = "0.19.5" +toml = { version = "0.7.3", features = ["preserve_order"] } +toml_edit = "0.19.6" unicode-segmentation = "1.10.1" unicode-width = "0.1.10" urlencoding = "2.1.2" From d2f77760dc0a91af8b5a5b36cbddcdfd0ff1c3e1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 00:27:23 +0000 Subject: [PATCH 17/29] build(deps): update rust crate nu-ansi-term to 0.47.0 --- Cargo.lock | 13 +++---------- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96fa6dbab..735c23c40 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1799,12 +1799,11 @@ dependencies = [ [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "1df031e117bca634c262e9bd3173776844b6c17a90b3741c9163663b4385af76" dependencies = [ - "overload", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -1952,12 +1951,6 @@ version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "parking" version = "2.0.0" diff --git a/Cargo.toml b/Cargo.toml index 4af764985..c71f77d41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ log = { version = "0.4.17", features = ["std"] } # nofity-rust is optional (on by default) because the crate doesn't currently build for darwin with nix # see: https://github.com/NixOS/nixpkgs/issues/160876 notify-rust = { version = "4.8.0", optional = true } -nu-ansi-term = "0.46.0" +nu-ansi-term = "0.47.0" once_cell = "1.17.1" open = "4.0.0" # update os module config and tests when upgrading os_info From 87afdf952615709e8782f27b3f3c72587c7d7b38 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 00:31:37 +0000 Subject: [PATCH 18/29] build(deps): update rust crate windows to 0.46.0 --- Cargo.lock | 68 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 735c23c40..e130d1293 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2739,7 +2739,7 @@ dependencies = [ "urlencoding", "versions", "which", - "windows 0.44.0", + "windows 0.46.0", "winres", "yaml-rust", ] @@ -3366,19 +3366,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", + "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", - "windows_x86_64_msvc 0.42.1", + "windows_x86_64_msvc 0.42.2", ] [[package]] name = "windows" -version = "0.44.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" dependencies = [ "windows-targets", ] @@ -3403,12 +3403,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", + "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", - "windows_x86_64_msvc 0.42.1", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -3422,24 +3422,24 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", + "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", - "windows_x86_64_msvc 0.42.1", + "windows_x86_64_msvc 0.42.2", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_msvc" @@ -3455,9 +3455,9 @@ checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" @@ -3473,9 +3473,9 @@ checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" @@ -3491,9 +3491,9 @@ checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" @@ -3509,15 +3509,15 @@ checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" @@ -3533,9 +3533,9 @@ checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winnow" diff --git a/Cargo.toml b/Cargo.toml index c71f77d41..df2e8665e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,7 +104,7 @@ features = ["preserve_order", "indexmap"] deelevate = "0.2.0" [target.'cfg(windows)'.dependencies.windows] -version = "0.44.0" +version = "0.46.0" features = [ "Win32_Foundation", "Win32_UI_Shell", From 19959ea2c3caeaff85ed6cce6d27c2c53c551f33 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 08:47:15 +0000 Subject: [PATCH 19/29] build(deps): update rust crate serde to 1.0.156 --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e130d1293..fcb213712 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2489,18 +2489,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.155" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f2b4817415c6d4210bfe1c7bfcf4801b2d904cb4d0e1a8fdb651013c9e86b8" +checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.155" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d071a94a3fac4aff69d023a7f411e33f40f3483f8c5190b1953822b6b76d7630" +checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index df2e8665e..5e7c4c1b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ rayon = "1.7.0" regex = "1.7.1" rust-ini = "0.18.0" semver = "1.0.17" -serde = { version = "1.0.155", features = ["derive"] } +serde = { version = "1.0.156", features = ["derive"] } serde_json = "1.0.94" sha1 = "0.10.5" shadow-rs = { version = "0.21.0", default-features = false } From 9d7a03993055974ba397a11ef9868c444e956148 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 14 Mar 2023 18:55:57 +0100 Subject: [PATCH 20/29] docs(preset): Add `hostname.ssh_symbol` to nerd font preset (#4991) docs(preset): Add missing ssh_symbol in nerd font --- docs/.vuepress/public/presets/toml/nerd-font-symbols.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/.vuepress/public/presets/toml/nerd-font-symbols.toml b/docs/.vuepress/public/presets/toml/nerd-font-symbols.toml index b27e83940..b570ea1c0 100644 --- a/docs/.vuepress/public/presets/toml/nerd-font-symbols.toml +++ b/docs/.vuepress/public/presets/toml/nerd-font-symbols.toml @@ -46,6 +46,9 @@ symbol = "⌘ " [hg_branch] symbol = " " +[hostname] +ssh_symbol = " " + [java] symbol = " " From c07a21d48abe4e01a96a2d1b641876207e8d02fb Mon Sep 17 00:00:00 2001 From: Stefan Cosma <66746+stefanc@users.noreply.github.com> Date: Tue, 14 Mar 2023 18:56:29 +0100 Subject: [PATCH 21/29] fix(fossil_branch): fossil checkout database file name on windows (#4978) fix(fossil_branch): use proper fossil checkout database file name on windows --- src/modules/fossil_branch.rs | 8 +++++++- src/test/mod.rs | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/modules/fossil_branch.rs b/src/modules/fossil_branch.rs index 730160693..da4dabbdb 100644 --- a/src/modules/fossil_branch.rs +++ b/src/modules/fossil_branch.rs @@ -17,9 +17,15 @@ pub fn module<'a>(context: &'a Context) -> Option> { return None; }; + let checkout_db = if cfg!(windows) { + "_FOSSIL_" + } else { + ".fslckout" + }; + let is_checkout = context .try_begin_scan()? - .set_files(&[".fslckout"]) + .set_files(&[checkout_db]) .is_match(); if !is_checkout { diff --git a/src/test/mod.rs b/src/test/mod.rs index 0e97bff86..973e0f5e8 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -176,11 +176,16 @@ pub enum FixtureProvider { pub fn fixture_repo(provider: FixtureProvider) -> io::Result { match provider { FixtureProvider::Fossil => { + let checkout_db = if cfg!(windows) { + "_FOSSIL_" + } else { + ".fslckout" + }; let path = tempfile::tempdir()?; fs::OpenOptions::new() .create(true) .write(true) - .open(path.path().join(".fslckout"))? + .open(path.path().join(checkout_db))? .sync_all()?; Ok(path) } From b4c282bb6e9901715387d87958c175fc37165d8a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 13:01:40 +0000 Subject: [PATCH 22/29] build(deps): update gitoxide crates --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fcb213712..f400cad20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -836,9 +836,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1853c840375a04e02315cb225b6d802291abfabbf08e500727c98a8670f1bf1" +checksum = "fd5e0d9c5df90c9b4d325ec716762beb7d6c1465a4049fec5c4f6b72e7824656" dependencies = [ "gix-actor", "gix-attributes", @@ -1023,9 +1023,9 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6a9dfa7b3c1a99315203e8b97f8f99f3bd95731590607abeaa5ca31bc41fe3" +checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22" dependencies = [ "crc32fast", "crossbeam-channel", @@ -1156,9 +1156,9 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.33.0" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66bc9d22f0d0620d013003ab05ead5c60124b6e1101bc245be9be4fd7e2330cb" +checksum = "e122e8e688313bdbd7ea40631beea562a56211e351ad24739fe412ab6df4e4b7" dependencies = [ "clru", "gix-chunk", @@ -1213,9 +1213,9 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de7cd1050fa82be4240994defc1f1f2fd9def5d8815dcd005f5ddc5e3dc7511" +checksum = "0949e07aa4ed00a5936c2f4529013540708f367906f542cf19db814957e80449" dependencies = [ "gix-actor", "gix-features", diff --git a/Cargo.toml b/Cargo.toml index 5e7c4c1b2..a8622359f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,8 +49,8 @@ dirs-next = "2.0.0" dunce = "1.0.3" gethostname = "0.4.1" # default feature restriction addresses https://github.com/starship/starship/issues/4251 -gix = { version = "0.41.0", default-features = false, features = ["max-performance-safe"] } -gix-features = { version = "0.28.0", optional = true } +gix = { version = "0.42.0", default-features = false, features = ["max-performance-safe"] } +gix-features = { version = "0.28.1", optional = true } indexmap = { version = "1.9.2", features = ["serde"] } log = { version = "0.4.17", features = ["std"] } # nofity-rust is optional (on by default) because the crate doesn't currently build for darwin with nix From 0ccb9e4bbf9d1382e1e60fb43a7209c37f5774c5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 05:25:17 +0000 Subject: [PATCH 23/29] build(deps): update rust crate toml_edit to 0.19.7 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f400cad20..6cc4cecf1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3019,9 +3019,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08de71aa0d6e348f070457f85af8bd566e2bc452156a423ddf22861b3a953fae" +checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" dependencies = [ "indexmap", "serde", diff --git a/Cargo.toml b/Cargo.toml index a8622359f..19b6434f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,7 +81,7 @@ strsim = "0.10.0" systemstat = "=0.2.3" terminal_size = "0.2.5" toml = { version = "0.7.3", features = ["preserve_order"] } -toml_edit = "0.19.6" +toml_edit = "0.19.7" unicode-segmentation = "1.10.1" unicode-width = "0.1.10" urlencoding = "2.1.2" From 38975e2d430e3a762b5d7fcf19177a040ae8a4ed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:03:55 +0000 Subject: [PATCH 24/29] build(deps): update clap crates --- Cargo.lock | 12 ++++++------ Cargo.toml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6cc4cecf1..5e7f49f1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.8" +version = "4.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" +checksum = "ce38afc168d8665cfc75c7b1dd9672e50716a137f433f070991619744a67342a" dependencies = [ "bitflags", "clap_derive", @@ -282,18 +282,18 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.1.4" +version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501ff0a401473ea1d4c3b125ff95506b62c5bc5768d818634195fbb7c4ad5ff4" +checksum = "37686beaba5ac9f3ab01ee3172f792fc6ffdd685bfb9e63cfef02c0571a4e8e1" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.1.8" +version = "4.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" +checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" dependencies = [ "heck 0.4.0", "proc-macro-error", diff --git a/Cargo.toml b/Cargo.toml index 19b6434f8..2ef4825de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,8 +43,8 @@ gix-faster = ["gix-features/zlib-stock", "gix/fast-sha1"] [dependencies] chrono = { version = "0.4.24", default-features = false, features = ["clock", "std", "wasmbind"] } -clap = { version = "4.1.8", features = ["derive", "cargo", "unicode"] } -clap_complete = "4.1.4" +clap = { version = "4.1.10", features = ["derive", "cargo", "unicode"] } +clap_complete = "4.1.5" dirs-next = "2.0.0" dunce = "1.0.3" gethostname = "0.4.1" From e6e4515539159da6a610f95b0fe2b3eedea8f600 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:05:30 +0000 Subject: [PATCH 25/29] build(deps): update rust crate serde to 1.0.157 --- Cargo.lock | 67 +++++++++++++++++++++++++++++++----------------------- Cargo.toml | 2 +- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5e7f49f1c..f033d9a38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -130,7 +130,7 @@ checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -147,7 +147,7 @@ checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -299,7 +299,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -496,7 +496,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -623,7 +623,7 @@ checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -1716,7 +1716,7 @@ dependencies = [ "cfg-if 1.0.0", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -1814,7 +1814,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -2038,7 +2038,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -2178,7 +2178,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.104", "version_check", ] @@ -2195,9 +2195,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" dependencies = [ "unicode-ident", ] @@ -2240,9 +2240,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -2454,7 +2454,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 1.0.104", ] [[package]] @@ -2489,22 +2489,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.156" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" +checksum = "707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.156" +version = "1.0.157" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +checksum = "78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.0", ] [[package]] @@ -2515,7 +2515,7 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -2537,7 +2537,7 @@ checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -2791,7 +2791,7 @@ dependencies = [ "heck 0.3.3", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -2805,6 +2805,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cff13bb1732bccfe3b246f3fdb09edfd51c01d6f5299b7ccd9457c2e4e37774" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "systemstat" version = "0.2.3" @@ -2939,7 +2950,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -3050,7 +3061,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -3262,7 +3273,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.104", "wasm-bindgen-shared", ] @@ -3284,7 +3295,7 @@ checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3612,7 +3623,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn", + "syn 1.0.104", ] [[package]] @@ -3649,5 +3660,5 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] diff --git a/Cargo.toml b/Cargo.toml index 2ef4825de..11090686f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ rayon = "1.7.0" regex = "1.7.1" rust-ini = "0.18.0" semver = "1.0.17" -serde = { version = "1.0.156", features = ["derive"] } +serde = { version = "1.0.157", features = ["derive"] } serde_json = "1.0.94" sha1 = "0.10.5" shadow-rs = { version = "0.21.0", default-features = false } From 71d35c324c0df90a948a74f3182ed926ae4148fc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 17:13:23 +0000 Subject: [PATCH 26/29] build(deps): update rust crate quick-xml to 0.28.1 --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f033d9a38..25ea8863d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2231,9 +2231,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a306703b4ad75d304a1bbc17d91d4399993caa163ad5028ffb044e5152ffcdd" +checksum = "e5c1a97b1bc42b1d550bfb48d4262153fe400a12bab1511821736f7eac76d7e2" dependencies = [ "memchr", ] @@ -2715,7 +2715,7 @@ dependencies = [ "pest", "pest_derive", "process_control", - "quick-xml 0.28.0", + "quick-xml 0.28.1", "rand 0.8.5", "rayon", "regex", diff --git a/Cargo.toml b/Cargo.toml index 11090686f..e9b791c60 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ os_info = "3.6.0" path-slash = "0.2.1" pest = "2.5.6" pest_derive = "2.5.6" -quick-xml = "0.28.0" +quick-xml = "0.28.1" rand = "0.8.5" rayon = "1.7.0" regex = "1.7.1" From 262747b87fcb1c891059f1ffab767b4aa65421a9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 Mar 2023 02:24:56 +0000 Subject: [PATCH 27/29] build(deps): update rust crate clap to 4.1.11 --- Cargo.lock | 32 +++++++++++++++++++------------- Cargo.toml | 2 +- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 25ea8863d..081d6d8c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,6 +168,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5dd14596c0e5b954530d0e6f1fd99b89c03e313aa2086e8da4303701a09e1cf" + [[package]] name = "block" version = "0.1.6" @@ -265,11 +271,11 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.10" +version = "4.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce38afc168d8665cfc75c7b1dd9672e50716a137f433f070991619744a67342a" +checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098" dependencies = [ - "bitflags", + "bitflags 2.0.1", "clap_derive", "clap_lex", "is-terminal", @@ -959,7 +965,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "693d4a4ba0531e46fe558459557a5b29fb86c3e4b2666c1c0861d93c7c678331" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bstr", "gix-path", "libc", @@ -1048,7 +1054,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bstr", ] @@ -1079,7 +1085,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "546ee7855d5d8731288f05a63c07ab41b59cb406660a825ed3fe89d7223823df" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bstr", "btoi", "filetime", @@ -1264,7 +1270,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" dependencies = [ - "bitflags", + "bitflags 1.3.2", "dirs 4.0.0", "gix-path", "libc", @@ -1725,7 +1731,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", @@ -1739,7 +1745,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset", @@ -1752,7 +1758,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "static_assertions", @@ -2356,7 +2362,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2409,7 +2415,7 @@ version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -2909,7 +2915,7 @@ checksum = "31ef6892cc0348a9b3b8c377addba91e0f6365863d92354bf27559dca81ee8c5" dependencies = [ "anyhow", "base64", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "filedescriptor", "hex", diff --git a/Cargo.toml b/Cargo.toml index e9b791c60..9332ef726 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ gix-faster = ["gix-features/zlib-stock", "gix/fast-sha1"] [dependencies] chrono = { version = "0.4.24", default-features = false, features = ["clock", "std", "wasmbind"] } -clap = { version = "4.1.10", features = ["derive", "cargo", "unicode"] } +clap = { version = "4.1.11", features = ["derive", "cargo", "unicode"] } clap_complete = "4.1.5" dirs-next = "2.0.0" dunce = "1.0.3" From 93df558ab5dbfb413d7f647fe60006a4cf2505df Mon Sep 17 00:00:00 2001 From: Christian Meusel Date: Mon, 20 Mar 2023 13:00:29 +0100 Subject: [PATCH 28/29] docs(preset): add missing config for Java to no-runtime-version (#5011) docs(preset): add missing Java to no-runtime-version --- docs/.vuepress/public/presets/toml/no-runtime-versions.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/.vuepress/public/presets/toml/no-runtime-versions.toml b/docs/.vuepress/public/presets/toml/no-runtime-versions.toml index 09accea7d..9778f2850 100644 --- a/docs/.vuepress/public/presets/toml/no-runtime-versions.toml +++ b/docs/.vuepress/public/presets/toml/no-runtime-versions.toml @@ -49,6 +49,9 @@ format = 'via [$symbol]($style)' [helm] format = 'via [$symbol]($style)' +[java] +format = 'via [$symbol]($style)' + [julia] format = 'via [$symbol]($style)' From 58d401acef1c3c39d720cdf17b73335e4193ee2d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 14:41:44 +0000 Subject: [PATCH 29/29] build(deps): update rust crate serde to 1.0.158 --- Cargo.lock | 14 +++++++------- Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 081d6d8c9..14097a913 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2495,22 +2495,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.157" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707de5fcf5df2b5788fca98dd7eab490bc2fd9b7ef1404defc462833b83f25ca" +checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.157" +version = "1.0.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78997f4555c22a7971214540c4a661291970619afd56de19f77e0de86296e1e5" +checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.0", + "syn 2.0.3", ] [[package]] @@ -2813,9 +2813,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cff13bb1732bccfe3b246f3fdb09edfd51c01d6f5299b7ccd9457c2e4e37774" +checksum = "e8234ae35e70582bfa0f1fedffa6daa248e41dd045310b19800c4a36382c8f60" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 9332ef726..f9e8be76e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,7 @@ rayon = "1.7.0" regex = "1.7.1" rust-ini = "0.18.0" semver = "1.0.17" -serde = { version = "1.0.157", features = ["derive"] } +serde = { version = "1.0.158", features = ["derive"] } serde_json = "1.0.94" sha1 = "0.10.5" shadow-rs = { version = "0.21.0", default-features = false }