chore: switch starship dependency back to the main one

This commit is contained in:
Barnaby Keene 2019-10-09 08:36:55 +01:00
parent c8671c719f
commit 47150efc14
2 changed files with 8 additions and 11 deletions

14
Cargo.lock generated
View file

@ -1626,7 +1626,7 @@ dependencies = [
"serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)",
"shellexpand 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"starship 0.21.0 (git+https://github.com/Southclaws/Starship?branch=prompt-api)",
"starship 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sublime_fuzzy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"subprocess 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
"surf 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2516,8 +2516,8 @@ dependencies = [
[[package]]
name = "starship"
version = "0.21.0"
source = "git+https://github.com/Southclaws/Starship?branch=prompt-api#de96556f8804f63a32a4f08c733fbb2c646f72f3"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
"battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2533,7 +2533,7 @@ dependencies = [
"pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
"starship_module_config_derive 0.1.0 (git+https://github.com/Southclaws/Starship?branch=prompt-api)",
"starship_module_config_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sysinfo 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
"toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2543,7 +2543,7 @@ dependencies = [
[[package]]
name = "starship_module_config_derive"
version = "0.1.0"
source = "git+https://github.com/Southclaws/Starship?branch=prompt-api#de96556f8804f63a32a4f08c733fbb2c646f72f3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3389,8 +3389,8 @@ dependencies = [
"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
"checksum stackvector 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1c4725650978235083241fab0fdc8e694c3de37821524e7534a1a9061d1068af"
"checksum starship 0.21.0 (git+https://github.com/Southclaws/Starship?branch=prompt-api)" = "<none>"
"checksum starship_module_config_derive 0.1.0 (git+https://github.com/Southclaws/Starship?branch=prompt-api)" = "<none>"
"checksum starship 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "43070194dc4cd97f37367c50ca51420c3b86303d4b259a9a73db71ee1658028d"
"checksum starship_module_config_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "36d147e2f158842551535289789d4f3ef5a37d4043f6dc96f3a461bb253e69a1"
"checksum static_assertions 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4f8de36da215253eb5f24020bfaa0646613b48bf7ebe36cdfa37c3b3b33b241"
"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
"checksum sublime_fuzzy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97bd7ad698ea493a3a7f60c2ffa117c234f341e09f8cc2d39cef10cdde077acf"

View file

@ -87,10 +87,7 @@ rawkey = {version = "0.1.2", optional = true }
clipboard = {version = "0.5", optional = true }
ptree = {version = "0.2", optional = true }
image = { version = "0.22.2", default_features = false, features = ["png_codec", "jpeg"], optional = true }
# Todo: wait for https://github.com/starship/starship/pull/509 to get merged/released
# then switch this back to a normal dependency declaration.
starship = { git = "https://github.com/Southclaws/Starship", branch = "prompt-api", optional = true}
starship = { version = "0.22.0", optional = true}
[features]
default = ["textview", "sys", "ps"]