Skip to content

Commit

Permalink
chore: thanks clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
oknozor committed Mar 8, 2024
1 parent aec74df commit 093306a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
14 changes: 8 additions & 6 deletions src/command/bump/monorepo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use anyhow::Result;
use colored::*;

use log::{info, warn};
use semver::{Prerelease, BuildMetadata};
use semver::{BuildMetadata, Prerelease};
use tera::Tera;

use crate::conventional::error::BumpError;
Expand Down Expand Up @@ -59,7 +59,7 @@ impl CocoGitto {
pub fn create_all_package_version_auto(&mut self, opts: BumpOptions) -> Result<()> {
self.pre_bump_checks(opts.skip_untracked)?;
// Get package bumps
let bumps = self.get_packages_bumps(opts.pre_release)?;
let bumps = self.get_packages_bumps(opts.pre_release, opts.build)?;

if bumps.is_empty() {
print!("No conventional commits found for your packages that required a bump. Changelogs will be updated on the next bump.\nPre-Hooks and Post-Hooks have been skiped.\n");
Expand Down Expand Up @@ -230,9 +230,7 @@ impl CocoGitto {

self.repository.add_all()?;
self.unwrap_or_stash_and_exit(&tag, hook_result);
self.bump_packages(opts.pre_release, opts.hooks_config, &bumps)?;

self.bump_packages(opts.pre_release, opts.build, opts.build, opts.hooks_config, &bumps)?;
self.bump_packages(opts.pre_release, opts.build, opts.hooks_config, &bumps)?;

let disable_bump_commit = opts.disable_bump_commit || SETTINGS.disable_bump_commit;

Expand Down Expand Up @@ -437,7 +435,11 @@ impl CocoGitto {
}

// Calculate all package bump
fn get_packages_bumps(&self, pre_release: Option<&str>, build: Option<&str>) -> Result<Vec<PackageBumpData>> {
fn get_packages_bumps(
&self,
pre_release: Option<&str>,
build: Option<&str>,
) -> Result<Vec<PackageBumpData>> {
let mut package_bumps = vec![];
for (package_name, package) in SETTINGS.packages.iter() {
let old = self.repository.get_latest_package_tag(package_name);
Expand Down
4 changes: 2 additions & 2 deletions src/command/bump/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{CocoGitto, SETTINGS};
use anyhow::Result;
use colored::*;
use log::info;
use semver::{Prerelease, BuildMetadata};
use semver::{BuildMetadata, Prerelease};
use tera::Tera;

impl CocoGitto {
Expand All @@ -34,7 +34,7 @@ impl CocoGitto {
}

if let Some(build) = opts.build {
tag.version.build = BuildMetadata::new(build)?;
next_version.version.build = BuildMetadata::new(build)?;
}

let tag = Tag::create(
Expand Down
2 changes: 1 addition & 1 deletion src/command/bump/standard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{settings, CocoGitto, SETTINGS};
use anyhow::Result;
use colored::*;
use log::info;
use semver::{Prerelease, BuildMetadata};
use semver::{BuildMetadata, Prerelease};
use tera::Tera;

impl CocoGitto {
Expand Down

0 comments on commit 093306a

Please sign in to comment.