mirror of
https://github.com/starship/starship.git
synced 2024-12-15 11:50:48 +01:00
Merge branch 'master' into conditional-style
This commit is contained in:
commit
85e8be985d
12
Cargo.lock
generated
12
Cargo.lock
generated
@ -2253,14 +2253,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "process_control"
|
||||
version = "4.0.0"
|
||||
version = "4.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c5c066e788f2eca1f84fbb2da941dfa255f220d57205350e60c3d8e60c6a735"
|
||||
checksum = "e1c4e268b11b4a74bd165fc416575cfc5d5d9bf97e647c354be6802987f9724a"
|
||||
dependencies = [
|
||||
"crossbeam-channel",
|
||||
"libc",
|
||||
"signal-hook 0.3.14",
|
||||
"windows-sys 0.36.1",
|
||||
"windows-sys 0.42.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2548,9 +2548,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "1.0.14"
|
||||
version = "1.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
|
||||
checksum = "3bfa246f936730408c0abee392cc1a50b118ece708c7f630516defd64480c7d8"
|
||||
|
||||
[[package]]
|
||||
name = "semver-parser"
|
||||
@ -2775,7 +2775,7 @@ dependencies = [
|
||||
"regex",
|
||||
"rust-ini",
|
||||
"schemars",
|
||||
"semver 1.0.14",
|
||||
"semver 1.0.15",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sha1",
|
||||
|
@ -69,7 +69,7 @@ rand = "0.8.5"
|
||||
rayon = "1.6.1"
|
||||
regex = "1.7.0"
|
||||
rust-ini = "0.18.0"
|
||||
semver = "1.0.14"
|
||||
semver = "1.0.15"
|
||||
serde = { version = "1.0.150", features = ["derive"] }
|
||||
serde_json = "1.0.89"
|
||||
sha1 = "0.10.5"
|
||||
@ -89,7 +89,7 @@ versions = "4.1.0"
|
||||
which = "4.3.0"
|
||||
yaml-rust = "0.4.5"
|
||||
|
||||
process_control = { version = "4.0.0", features = ["crossbeam-channel"] }
|
||||
process_control = { version = "4.0.1", features = ["crossbeam-channel"] }
|
||||
|
||||
guess_host_triple = "0.1.3"
|
||||
home = "0.5.4"
|
||||
|
@ -373,16 +373,7 @@ mod tests {
|
||||
.output()?;
|
||||
|
||||
let git_tag = create_command("git")?
|
||||
.args([
|
||||
"for-each-ref",
|
||||
"--contains",
|
||||
"HEAD",
|
||||
"--sort=-taggerdate",
|
||||
"--count=1",
|
||||
"--format",
|
||||
"%(refname:short)",
|
||||
"refs/tags",
|
||||
])
|
||||
.args(["describe", "--tags"])
|
||||
.current_dir(repo_dir.path())
|
||||
.output()?
|
||||
.stdout;
|
||||
@ -443,16 +434,7 @@ mod tests {
|
||||
.output()?;
|
||||
|
||||
let git_tag = create_command("git")?
|
||||
.args([
|
||||
"for-each-ref",
|
||||
"--contains",
|
||||
"HEAD",
|
||||
"--sort=-taggerdate",
|
||||
"--count=1",
|
||||
"--format",
|
||||
"%(refname:short)",
|
||||
"refs/tags",
|
||||
])
|
||||
.args(["describe", "--tags"])
|
||||
.current_dir(repo_dir.path())
|
||||
.output()?
|
||||
.stdout;
|
||||
|
@ -89,7 +89,7 @@ fn get_wrapper_properties_file(context: &Context, recursive: bool) -> Option<Str
|
||||
.is_match()
|
||||
{
|
||||
properties = utils::read_file(
|
||||
&context
|
||||
context
|
||||
.current_dir
|
||||
.join("gradle/wrapper/gradle-wrapper.properties"),
|
||||
)
|
||||
@ -98,7 +98,7 @@ fn get_wrapper_properties_file(context: &Context, recursive: bool) -> Option<Str
|
||||
if recursive && properties.is_none() {
|
||||
for dir in context.current_dir.ancestors().skip(1) {
|
||||
properties =
|
||||
utils::read_file(&dir.join("gradle/wrapper/gradle-wrapper.properties")).ok();
|
||||
utils::read_file(dir.join("gradle/wrapper/gradle-wrapper.properties")).ok();
|
||||
if properties.is_some() {
|
||||
break;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user