From eb67534ac98bd379e065b788bceba7704bf28628 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Thu, 30 Jun 2022 22:18:29 +0200 Subject: [PATCH 1/3] chore: fix new clippy lints (#4136) --- src/configs/starship_root.rs | 2 +- src/context.rs | 4 ++-- src/formatter/string_formatter.rs | 2 +- src/modules/vlang.rs | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/configs/starship_root.rs b/src/configs/starship_root.rs index 9f8559570..e8b2ed742 100644 --- a/src/configs/starship_root.rs +++ b/src/configs/starship_root.rs @@ -99,7 +99,7 @@ pub const PROMPT_ORDER: &[&str] = &[ ]; // 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 { Self { schema: "https://starship.rs/config-schema.json".to_string(), diff --git a/src/context.rs b/src/context.rs index 1a8a16644..743c242fd 100644 --- a/src/context.rs +++ b/src/context.rs @@ -573,7 +573,7 @@ fn get_remote_repository_info(repository: &Repository) -> Option { None } -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum Shell { Bash, Fish, @@ -589,7 +589,7 @@ pub enum Shell { } /// Which kind of prompt target to print (main prompt, rprompt, ...) -#[derive(Debug, Clone, Copy, PartialEq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum Target { Main, Right, diff --git a/src/formatter/string_formatter.rs b/src/formatter/string_formatter.rs index 5350ff4db..3755edc7d 100644 --- a/src/formatter/string_formatter.rs +++ b/src/formatter/string_formatter.rs @@ -32,7 +32,7 @@ type VariableMapType<'a> = type StyleVariableMapType<'a> = BTreeMap, StringFormatterError>>>; -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub enum StringFormatterError { Custom(String), Parse(PestError), diff --git a/src/modules/vlang.rs b/src/modules/vlang.rs index 6ca6dd5f8..85ccb40f4 100644 --- a/src/modules/vlang.rs +++ b/src/modules/vlang.rs @@ -58,7 +58,6 @@ pub fn module<'a>(context: &'a Context) -> Option> { fn parse_v_version(v_version: &str) -> Option { let version = v_version - .trim() // split into ["V", "0.2", "30c0659"] .split_whitespace() // return "0.2" From 40408b7ed475f979c91ebbc153ea1100ffd6353f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 03:05:46 -0400 Subject: [PATCH 2/3] build: bump semver from 1.0.11 to 1.0.12 (#4140) Bumps [semver](https://github.com/dtolnay/semver) from 1.0.11 to 1.0.12. - [Release notes](https://github.com/dtolnay/semver/releases) - [Commits](https://github.com/dtolnay/semver/compare/1.0.11...1.0.12) --- updated-dependencies: - dependency-name: semver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9371d55a3..9cb08b1fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1800,9 +1800,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d92beeab217753479be2f74e54187a6aed4c125ff0703a866c3147a02f0c6dd" +checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" [[package]] name = "semver-parser" @@ -2036,7 +2036,7 @@ dependencies = [ "regex", "rust-ini", "schemars", - "semver 1.0.11", + "semver 1.0.12", "serde", "serde_json", "sha-1 0.10.0", diff --git a/Cargo.toml b/Cargo.toml index 96a9d6210..4351400cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,7 +61,7 @@ rand = "0.8.5" rayon = "1.5.3" regex = "1.5.6" rust-ini = "0.18.0" -semver = "1.0.11" +semver = "1.0.12" serde = { version = "1.0.137", features = ["derive"] } serde_json = "1.0.82" sha-1 = "0.10.0" From 91138b3329ff134fa6289dfd058668b028594ef7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 04:07:19 -0400 Subject: [PATCH 3/3] build: bump clap from 3.2.7 to 3.2.8 (#4139) Bumps [clap](https://github.com/clap-rs/clap) from 3.2.7 to 3.2.8. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v3.2.7...v3.2.8) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9cb08b1fb..c84753e8f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -270,9 +270,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.7" +version = "3.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7b16274bb247b45177db843202209b12191b631a14a9d06e41b3777d6ecf14" +checksum = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83" dependencies = [ "atty", "bitflags", diff --git a/Cargo.toml b/Cargo.toml index 4351400cd..cfbbb7e1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ notify = ["notify-rust"] [dependencies] ansi_term = "0.12.1" 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" dirs-next = "2.0.0" dunce = "1.0.2"