extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-12-16 04:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into conditional-style

Browse Source
This commit is contained in:
Filip Bachul 2022-07-06 09:36:25 +02:00
commit 76d1a0c8d8
2 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Cargo.lock generated
View File

@ -895,6 +895,12 @@ dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "io-lifetimes"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb"
[[package]]
name = "is_debug"
version = "1.0.1"
@ -973,6 +979,12 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
version = "0.0.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
[[package]]
name = "local_ipaddress"
version = "0.1.3"
@ -1239,9 +1251,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.12.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
[[package]]
name = "opaque-debug"
@ -1752,6 +1764,20 @@ dependencies = [
"ordered-multimap",
]
[[package]]
name = "rustix"
version = "0.35.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d51cc38aa10f6bbb377ed28197aa052aa4e2b762c22be9d3153d01822587e787"
dependencies = [
"bitflags",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys",
"windows-sys",
]
[[package]]
name = "ryu"
version = "1.0.10"
@ -1815,18 +1841,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.137"
version = "1.0.138"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.137"
version = "1.0.138"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c"
dependencies = [
"proc-macro2",
"quote",
@ -1919,9 +1945,9 @@ dependencies = [
[[package]]
name = "shadow-rs"
version = "0.11.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f47e98e36909e951f4da3908f4475f969bec92a41734dd92e883aaa11c10294b"
checksum = "ed1b83da0a4e48d8dcc13ad177b64f2fc40097974f9bf176c2bcb702cabadff3"
dependencies = [
"chrono",
"const_format",
@ -2159,12 +2185,12 @@ dependencies = [
[[package]]
name = "terminal_size"
version = "0.1.17"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
checksum = "8440c860cf79def6164e4a0a983bcc2305d82419177a0e0c71930d049e3ac5a1"
dependencies = [
"libc",
"winapi",
"rustix",
"windows-sys",
]
[[package]]

10
Cargo.toml
View File

@ -50,7 +50,7 @@ log = { version = "0.4.16", 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.5.8", optional = true }
once_cell = "1.12.0"
once_cell = "1.13.0"
open = "3.0.1"
os_info = "3.4.0"
path-slash = "0.1.4"
@ -62,16 +62,16 @@ rayon = "1.5.3"
regex = "1.5.6"
rust-ini = "0.18.0"
semver = "1.0.12"
serde = { version = "1.0.137", features = ["derive"] }
serde = { version = "1.0.138", features = ["derive"] }
serde_json = "1.0.82"
sha-1 = "0.10.0"
shadow-rs = "0.11.0"
shadow-rs = "0.12.0"
# battery is optional (on by default) because the crate doesn't currently build for Termux
# see: https://github.com/svartalf/rust-battery/issues/33
starship-battery = { version = "0.7.9", optional = true }
strsim = "0.10.0"
systemstat = "=0.1.11"
terminal_size = "0.1.17"
terminal_size = "0.2.1"
toml = { version = "0.5.9", features = ["preserve_order"] }
toml_edit = "0.14.4"
unicode-segmentation = "1.9.0"
@ -109,7 +109,7 @@ features = [
nix = { version = "0.24.1", default-features = false, features = ["feature", "fs", "user"] }
[build-dependencies]
shadow-rs = "0.11.0"
shadow-rs = "0.12.0"
[target.'cfg(windows)'.build-dependencies]
winres = "0.1.12"