extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2025-01-19 04:48:17 +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-01 13:04:41 +02:00
commit 10228ef5d9
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -270,9 +270,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "3.2.7" version = "3.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b7b16274bb247b45177db843202209b12191b631a14a9d06e41b3777d6ecf14" checksum = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83"
dependencies = [ dependencies = [
"atty", "atty",
"bitflags", "bitflags",
@ -1800,9 +1800,9 @@ dependencies = [
[[package]] [[package]]
name = "semver" name = "semver"
version = "1.0.11" version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d92beeab217753479be2f74e54187a6aed4c125ff0703a866c3147a02f0c6dd" checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
[[package]] [[package]]
name = "semver-parser" name = "semver-parser"
@ -2036,7 +2036,7 @@ dependencies = [
"regex", "regex",
"rust-ini", "rust-ini",
"schemars", "schemars",
"semver 1.0.11", "semver 1.0.12",
"serde", "serde",
"serde_json", "serde_json",
"sha-1 0.10.0", "sha-1 0.10.0",

4
Cargo.toml
View File

@ -38,7 +38,7 @@ notify = ["notify-rust"]
[dependencies] [dependencies]
ansi_term = "0.12.1" ansi_term = "0.12.1"
chrono = "0.4.19" chrono = "0.4.19"
clap = { version = "=3.2.7", features = ["derive", "cargo", "unicode", "unstable-v4"] } clap = { version = "=3.2.8", features = ["derive", "cargo", "unicode", "unstable-v4"] }
clap_complete = "3.2.3" clap_complete = "3.2.3"
dirs-next = "2.0.0" dirs-next = "2.0.0"
dunce = "1.0.2" dunce = "1.0.2"
@ -61,7 +61,7 @@ rand = "0.8.5"
rayon = "1.5.3" rayon = "1.5.3"
regex = "1.5.6" regex = "1.5.6"
rust-ini = "0.18.0" rust-ini = "0.18.0"
semver = "1.0.11" semver = "1.0.12"
serde = { version = "1.0.137", features = ["derive"] } serde = { version = "1.0.137", features = ["derive"] }
serde_json = "1.0.82" serde_json = "1.0.82"
sha-1 = "0.10.0" sha-1 = "0.10.0"

2
src/configs/starship_root.rs
View File

@ -99,7 +99,7 @@ pub const PROMPT_ORDER: &[&str] = &[
]; ];
// On changes please also update `Default` for the `FullConfig` struct in `mod.rs` // On changes please also update `Default` for the `FullConfig` struct in `mod.rs`
impl<'a> Default for StarshipRootConfig { impl Default for StarshipRootConfig {
fn default() -> Self { fn default() -> Self {
Self { Self {
schema: "https://starship.rs/config-schema.json".to_string(), schema: "https://starship.rs/config-schema.json".to_string(),

4
src/context.rs
View File

@ -573,7 +573,7 @@ fn get_remote_repository_info(repository: &Repository) -> Option<Remote> {
None None
} }
#[derive(Debug, Clone, Copy, PartialEq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Shell { pub enum Shell {
Bash, Bash,
Fish, Fish,
@ -589,7 +589,7 @@ pub enum Shell {
} }
/// Which kind of prompt target to print (main prompt, rprompt, ...) /// Which kind of prompt target to print (main prompt, rprompt, ...)
#[derive(Debug, Clone, Copy, PartialEq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Target { pub enum Target {
Main, Main,
Right, Right,

2
src/formatter/string_formatter.rs
View File

@ -32,7 +32,7 @@ type VariableMapType<'a> =
type StyleVariableMapType<'a> = type StyleVariableMapType<'a> =
BTreeMap<String, Option<Result<Cow<'a, str>, StringFormatterError>>>; BTreeMap<String, Option<Result<Cow<'a, str>, StringFormatterError>>>;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub enum StringFormatterError { pub enum StringFormatterError {
Custom(String), Custom(String),
Parse(PestError<Rule>), Parse(PestError<Rule>),

1
src/modules/vlang.rs
View File

@ -58,7 +58,6 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
fn parse_v_version(v_version: &str) -> Option<String> { fn parse_v_version(v_version: &str) -> Option<String> {
let version = v_version let version = v_version
.trim()
// split into ["V", "0.2", "30c0659"] // split into ["V", "0.2", "30c0659"]
.split_whitespace() .split_whitespace()
// return "0.2" // return "0.2"