Skip to content

Commit

Permalink
Move DEFAULT_PACKAGE_NAME to knope-versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
dbanty committed Jul 13, 2024
1 parent 3a02b39 commit bc12017
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 18 deletions.
1 change: 1 addition & 0 deletions crates/knope-versioning/src/changes/changeset.rs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
pub const CHANGESET_DIR: &str = ".changeset";
pub const DEFAULT_PACKAGE_NAME: &str = "default";
4 changes: 1 addition & 3 deletions crates/knope-versioning/src/changes/mod.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#![allow(dead_code)] // TODO: Remove this

use std::{fmt::Display, sync::Arc};

pub use changeset::CHANGESET_DIR;
pub use changeset::{CHANGESET_DIR, DEFAULT_PACKAGE_NAME};
use git_conventional::FooterToken;

use crate::changelog::{CommitFooter, CustomChangeType, SectionSource};
Expand Down
10 changes: 2 additions & 8 deletions crates/knope/src/step/releases/changesets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{collections::HashSet, io::Write, path::PathBuf};
use changesets::{ChangeSet, UniqueId, Versioning};
use inquire::{MultiSelect, Select};
use itertools::Itertools;
use knope_versioning::changes::{ChangeType, CHANGESET_DIR};
use knope_versioning::changes::{ChangeType, CHANGESET_DIR, DEFAULT_PACKAGE_NAME};
use miette::Diagnostic;

use super::Package;
Expand Down Expand Up @@ -79,8 +79,6 @@ pub(crate) fn create_change_file(run_type: RunType) -> Result<RunType, Error> {
Ok(RunType::Real(state))
}

pub(crate) const DEFAULT_CHANGESET_PACKAGE_NAME: &str = "default";

// TODO: Move some of this to knope_versioning
pub(crate) fn add_releases_from_changeset(
packages: Vec<Package>,
Expand All @@ -97,11 +95,7 @@ pub(crate) fn add_releases_from_changeset(
.into_iter()
.map(|mut package| {
if let Some(release_changes) = releases.iter().find(|release| {
release.package_name
== package
.name
.as_deref()
.unwrap_or(DEFAULT_CHANGESET_PACKAGE_NAME)
release.package_name == package.name.as_deref().unwrap_or(DEFAULT_PACKAGE_NAME)
}) {
package
.pending_changes
Expand Down
9 changes: 3 additions & 6 deletions crates/knope/src/step/releases/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use std::{
use itertools::Itertools;
use knope_config::changelog_section::convert_to_versioning;
use knope_versioning::{
changes::{Change, ChangeSource, CHANGESET_DIR},
changes::{Change, ChangeSource, CHANGESET_DIR, DEFAULT_PACKAGE_NAME},
GoVersioning, Label, PackageNewError, Version, VersionedFile, VersionedFileError,
};
use miette::Diagnostic;
Expand All @@ -20,7 +20,6 @@ use serde::{Deserialize, Serialize};
use super::{
changelog,
changelog::Changelog,
changesets::DEFAULT_CHANGESET_PACKAGE_NAME,
semver,
semver::{bump, ConventionalRule},
Release, Rule,
Expand Down Expand Up @@ -287,9 +286,7 @@ impl Display for Package {
write!(
f,
"{}",
self.name
.as_deref()
.unwrap_or(DEFAULT_CHANGESET_PACKAGE_NAME)
self.name.as_deref().unwrap_or(DEFAULT_PACKAGE_NAME)
)
}
}
Expand All @@ -300,7 +297,7 @@ pub(crate) struct PackageName(String);

impl Default for PackageName {
fn default() -> Self {
Self(DEFAULT_CHANGESET_PACKAGE_NAME.to_string())
Self(DEFAULT_PACKAGE_NAME.to_string())
}
}

Expand Down
1 change: 0 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ allow = [
"BSD-3-Clause",
"Unicode-DFS-2016",
"CC0-1.0",
"Unicode-3.0",
]
# The confidence threshold for detecting a license from license text.
# The higher the value, the more closely the license text must be to the
Expand Down

0 comments on commit bc12017

Please sign in to comment.