From 67c2c0c0c5b2820421c901e0fac13bb3187bd129 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Fri, 4 Aug 2023 01:19:15 +0200 Subject: [PATCH] chore(rust): fmt Signed-off-by: kjuulh --- ci/src/main.rs | 11 ----------- .../cuddle-please-commands/src/release_command.rs | 13 ++++--------- .../src/gatheres/config_file.rs | 7 +++---- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/ci/src/main.rs b/ci/src/main.rs index 0eaab34..0be3103 100644 --- a/ci/src/main.rs +++ b/ci/src/main.rs @@ -2,20 +2,15 @@ use std::path::Path; use std::path::PathBuf; use std::sync::Arc; - use clap::Args; use clap::Parser; use clap::Subcommand; use clap::ValueEnum; - - use dagger_sdk::Platform; use dagger_sdk::QueryContainerOpts; use futures::StreamExt; - - use crate::please_release::run_release_please; #[derive(Parser, Clone)] @@ -257,8 +252,6 @@ mod please_release { use std::sync::Arc; - - use crate::{base_rust_image, GlobalArgs}; pub async fn run_release_please( @@ -429,10 +422,6 @@ mod build { use dagger_sdk::Container; - - - - use crate::{base_rust_image, get_base_debian_image, GlobalArgs}; pub async fn build_and_deploy( diff --git a/crates/cuddle-please-commands/src/release_command.rs b/crates/cuddle-please-commands/src/release_command.rs index 4ef7d1d..c8c8272 100644 --- a/crates/cuddle-please-commands/src/release_command.rs +++ b/crates/cuddle-please-commands/src/release_command.rs @@ -50,10 +50,8 @@ impl ReleaseCommandHandler { tracing::trace!("fetched commits since last version"); let current_version = get_current_version(significant_tag); tracing::trace!("found current version: {}", current_version.to_string()); - self.ui.write_str_ln(&format!( - "found current version: {}", - current_version - )); + self.ui + .write_str_ln(&format!("found current version: {}", current_version)); let conventional_commit_results = parse_conventional_commits(current_version, commits)?; tracing::trace!("parsing conventional commits"); @@ -64,10 +62,8 @@ impl ReleaseCommandHandler { return Ok(()); } let (commit_strs, next_version) = conventional_commit_results.unwrap(); - self.ui.write_str_ln(&format!( - "calculated next version: {}", - next_version - )); + self.ui + .write_str_ln(&format!("calculated next version: {}", next_version)); tracing::trace!("creating changelog"); let (changelog_placement, changelog, changelog_last_changes) = @@ -253,7 +249,6 @@ fn parse_conventional_commits( } fn get_current_version(significant_tag: Option) -> Version { - significant_tag .map(|st| Version::try_from(st).unwrap()) .unwrap_or(Version::new(0, 0, 0)) diff --git a/crates/cuddle-please-frontend/src/gatheres/config_file.rs b/crates/cuddle-please-frontend/src/gatheres/config_file.rs index 3a980c8..3c27af8 100644 --- a/crates/cuddle-please-frontend/src/gatheres/config_file.rs +++ b/crates/cuddle-please-frontend/src/gatheres/config_file.rs @@ -30,10 +30,9 @@ const CUDDLE_CONFIG_FILE_NAME: &str = "cuddle.please"; const YAML_EXTENSION: &str = "yaml"; pub fn get_config_from_config_file(current_dir: &Path) -> PleaseConfigBuilder { - let current_cuddle_path = current_dir - .join(format!("{CUDDLE_FILE_NAME}.{YAML_EXTENSION}")); - let current_cuddle_config_path = current_dir - .join(format!("{CUDDLE_CONFIG_FILE_NAME}.{YAML_EXTENSION}")); + let current_cuddle_path = current_dir.join(format!("{CUDDLE_FILE_NAME}.{YAML_EXTENSION}")); + let current_cuddle_config_path = + current_dir.join(format!("{CUDDLE_CONFIG_FILE_NAME}.{YAML_EXTENSION}")); let mut please_config = PleaseConfigBuilder::default(); if let Some(config) = get_config_from_file::(current_cuddle_path) {