mirror of
https://github.com/starship/starship.git
synced 2025-01-23 06:39:47 +01:00
Merge branch 'master' into conditional-style
This commit is contained in:
commit
a80010afd2
2
.github/workflows/format-workflow.yml
vendored
2
.github/workflows/format-workflow.yml
vendored
@ -35,7 +35,7 @@ jobs:
|
||||
if: ${{ github.event_name == 'pull_request' }}
|
||||
steps:
|
||||
- name: Prevent File Change
|
||||
uses: xalvarez/prevent-file-change-action@v1.2.0
|
||||
uses: xalvarez/prevent-file-change-action@v1.3.0
|
||||
if: ${{ github.event.pull_request.head.ref != 'i18n_master' }}
|
||||
with:
|
||||
githubToken: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
18
Cargo.lock
generated
18
Cargo.lock
generated
@ -1979,9 +1979,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pest_derive"
|
||||
version = "2.3.0"
|
||||
version = "2.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "905708f7f674518498c1f8d644481440f476d39ca6ecae83319bba7c6c12da91"
|
||||
checksum = "502b62a6d0245378b04ffe0a7fb4f4419a4815fce813bd8a0ec89a56e07d67b1"
|
||||
dependencies = [
|
||||
"pest",
|
||||
"pest_generator",
|
||||
@ -1989,9 +1989,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pest_generator"
|
||||
version = "2.3.0"
|
||||
version = "2.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5803d8284a629cc999094ecd630f55e91b561a1d1ba75e233b00ae13b91a69ad"
|
||||
checksum = "451e629bf49b750254da26132f1a5a9d11fd8a95a3df51d15c4abd1ba154cb6c"
|
||||
dependencies = [
|
||||
"pest",
|
||||
"pest_meta",
|
||||
@ -2002,13 +2002,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pest_meta"
|
||||
version = "2.3.0"
|
||||
version = "2.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1538eb784f07615c6d9a8ab061089c6c54a344c5b4301db51990ca1c241e8c04"
|
||||
checksum = "bcec162c71c45e269dfc3fc2916eaeb97feab22993a21bcce4721d08cd7801a6"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"pest",
|
||||
"sha-1",
|
||||
"sha1 0.10.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2163,9 +2163,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "process_control"
|
||||
version = "3.5.1"
|
||||
version = "4.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1cb5bbabc4567bc85bc86d667f7ef1c5060280037269232b248cef94fc7654bd"
|
||||
checksum = "5c5c066e788f2eca1f84fbb2da941dfa255f220d57205350e60c3d8e60c6a735"
|
||||
dependencies = [
|
||||
"crossbeam-channel",
|
||||
"libc",
|
||||
|
@ -56,7 +56,7 @@ open = "3.0.2"
|
||||
os_info = "3.5.0"
|
||||
path-slash = "0.2.1"
|
||||
pest = "2.3.1"
|
||||
pest_derive = "2.3.0"
|
||||
pest_derive = "2.3.1"
|
||||
quick-xml = "0.25.0"
|
||||
rand = "0.8.5"
|
||||
rayon = "1.5.3"
|
||||
@ -82,7 +82,7 @@ versions = "4.1.0"
|
||||
which = "4.3.0"
|
||||
yaml-rust = "0.4.5"
|
||||
|
||||
process_control = { version = "3.5.1", features = ["crossbeam-channel"] }
|
||||
process_control = { version = "4.0.0", features = ["crossbeam-channel"] }
|
||||
|
||||
guess_host_triple = "0.1.3"
|
||||
home = "0.5.3"
|
||||
|
Loading…
Reference in New Issue
Block a user