mirror of
https://github.com/starship/starship.git
synced 2025-02-21 21:02:41 +01:00
Merge branch 'master' into conditional-style
This commit is contained in:
commit
c40321c4d7
3
.github/workflows/workflow.yml
vendored
3
.github/workflows/workflow.yml
vendored
@ -200,7 +200,7 @@ jobs:
|
||||
run: cargo install --version 0.3.4 cargo-wix
|
||||
env:
|
||||
# cargo-wix does not require static crt
|
||||
RUSTFLAGS: ''
|
||||
RUSTFLAGS: ""
|
||||
|
||||
# Install Mercurial (pre-installed on Linux and windows)
|
||||
- name: Setup | Mercurial (macos)
|
||||
@ -247,4 +247,3 @@ jobs:
|
||||
with:
|
||||
token: ${{ secrets.CODECOV_TOKEN }}
|
||||
files: lcov.info
|
||||
fail_ci_if_error: true
|
||||
|
12
Cargo.lock
generated
12
Cargo.lock
generated
@ -283,9 +283,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.1.0"
|
||||
version = "4.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa91278560fc226a5d9d736cc21e485ff9aad47d26b8ffe1f54cba868b684b9f"
|
||||
checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"clap_derive",
|
||||
@ -1188,7 +1188,7 @@ checksum = "ad3f84ec28896f6a4b3f3174a1125117ac91788b1c64d96f25eabcd8d01cc7e3"
|
||||
dependencies = [
|
||||
"git-command",
|
||||
"git-config-value",
|
||||
"nix 0.26.1",
|
||||
"nix 0.26.2",
|
||||
"parking_lot 0.12.1",
|
||||
"thiserror",
|
||||
]
|
||||
@ -1790,9 +1790,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.26.1"
|
||||
version = "0.26.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
|
||||
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg-if 1.0.0",
|
||||
@ -2806,7 +2806,7 @@ dependencies = [
|
||||
"indexmap",
|
||||
"log",
|
||||
"mockall",
|
||||
"nix 0.26.1",
|
||||
"nix 0.26.2",
|
||||
"notify-rust",
|
||||
"nu-ansi-term",
|
||||
"once_cell",
|
||||
|
@ -43,7 +43,7 @@ git-repository-faster = ["git-features/zlib-stock", "git-repository/fast-sha1"]
|
||||
|
||||
[dependencies]
|
||||
chrono = { version = "0.4.23", default-features = false, features = ["clock", "std", "wasmbind"] }
|
||||
clap = { version = "4.1.0", features = ["derive", "cargo", "unicode"] }
|
||||
clap = { version = "4.1.1", features = ["derive", "cargo", "unicode"] }
|
||||
clap_complete = "4.1.0"
|
||||
dirs-next = "2.0.0"
|
||||
dunce = "1.0.3"
|
||||
@ -114,7 +114,7 @@ features = [
|
||||
]
|
||||
|
||||
[target.'cfg(not(windows))'.dependencies]
|
||||
nix = { version = "0.26.1", default-features = false, features = ["feature", "fs", "user"] }
|
||||
nix = { version = "0.26.2", default-features = false, features = ["feature", "fs", "user"] }
|
||||
|
||||
[build-dependencies]
|
||||
shadow-rs = { version = "0.20.0", default-features = false }
|
||||
|
Loading…
Reference in New Issue
Block a user