refactor: git: use newtype
All checks were successful
Rust / build (push) Successful in 1m39s
ci/woodpecker/push/cron-docker-builder Pipeline was successful
ci/woodpecker/push/push-next Pipeline was successful
ci/woodpecker/push/tag-created Pipeline was successful

This commit is contained in:
Paul Campbell 2024-06-20 19:03:11 +01:00
parent b9940cd205
commit 2cdaf39c0f
9 changed files with 33 additions and 25 deletions

View file

@ -777,7 +777,7 @@ mod forgejo {
} }
pub fn repo_details(fs: &kxio::fs::FileSystem) -> git::RepoDetails { pub fn repo_details(fs: &kxio::fs::FileSystem) -> git::RepoDetails {
let generation = git::Generation::new(); let generation = git::Generation::default();
let repo_alias = a_repo_alias(); let repo_alias = a_repo_alias();
let server_repo_config = a_server_repo_config(); let server_repo_config = a_server_repo_config();
let forge_alias = a_forge_alias(); let forge_alias = a_forge_alias();

View file

@ -636,7 +636,7 @@ mod github {
} }
pub fn repo_details() -> git::RepoDetails { pub fn repo_details() -> git::RepoDetails {
git::RepoDetails::new( git::RepoDetails::new(
git::Generation::new(), git::Generation::default(),
&a_repo_alias(), &a_repo_alias(),
&ServerRepoConfig::new( &ServerRepoConfig::new(
format!("{}/{}", a_name(), a_name()), // repo path: owner/repo format!("{}/{}", a_name(), a_name()), // repo path: owner/repo

View file

@ -39,7 +39,7 @@ fn given_repo_details(forge_type: config::ForgeType) -> RepoDetails {
let fs = given_fs(); let fs = given_fs();
git::common::repo_details( git::common::repo_details(
1, 1,
git::Generation::new(), git::Generation::default(),
config::common::forge_details(1, forge_type), config::common::forge_details(1, forge_type),
Some(config::common::repo_config( Some(config::common::repo_config(
1, 1,

View file

@ -1,7 +1,19 @@
use config::newtype;
use derive_more::Display;
// //
use git_next_config as config; use git_next_config as config;
#[derive(Clone, Debug, PartialEq, Eq, derive_more::Constructor, derive_more::Display)] #[derive(
Clone,
Debug,
Hash,
PartialEq,
Eq,
PartialOrd,
Ord,
derive_more::Constructor,
derive_more::Display,
)]
#[display("{}", sha)] #[display("{}", sha)]
pub struct Commit { pub struct Commit {
sha: Sha, sha: Sha,
@ -25,11 +37,8 @@ impl From<config::webhook::Push> for Commit {
} }
} }
#[derive(Clone, Debug, PartialEq, Eq, derive_more::Constructor, derive_more::Display)] newtype!(Sha is a String, Display);
pub struct Sha(String); newtype!(Message is a String);
#[derive(Clone, Debug, PartialEq, Eq, derive_more::Constructor, derive_more::Display)]
pub struct Message(String);
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Histories { pub struct Histories {

View file

@ -1,9 +1,8 @@
#[derive(Copy, Clone, Default, Debug, PartialEq, Eq, PartialOrd, Ord, derive_more::Display)] use derive_more::Display;
pub struct Generation(u32); use git_next_config::newtype;
newtype!(Generation is a u32, Display, Default, Copy);
impl Generation { impl Generation {
pub fn new() -> Self {
Self::default()
}
pub fn inc(&mut self) { pub fn inc(&mut self) {
self.0 += 1 self.0 += 1
} }

View file

@ -1,11 +1,11 @@
// //
use crate as git; use crate as git;
use derive_more::Constructor; use derive_more::Display;
use git_next_config::newtype;
use crate::Commit; use crate::Commit;
#[derive(Clone, Constructor, Debug, Hash, PartialEq, Eq, derive_more::Display)] newtype!(GitRef is a String, Display);
pub struct GitRef(String);
impl From<Commit> for GitRef { impl From<Commit> for GitRef {
fn from(value: Commit) -> Self { fn from(value: Commit) -> Self {
Self(value.sha().to_string()) Self(value.sha().to_string())

View file

@ -40,7 +40,7 @@ mod generation {
#[test] #[test]
fn should_increment() { fn should_increment() {
let mut g = Generation::new(); let mut g = Generation::default();
assert_eq!(g.to_string(), "0"); assert_eq!(g.to_string(), "0");
g.inc(); g.inc();
@ -153,7 +153,7 @@ mod repo_details {
#[test] #[test]
fn should_return_origin() { fn should_return_origin() {
let rd = RepoDetails::new( let rd = RepoDetails::new(
Generation::new(), Generation::default(),
&RepoAlias::new("foo"), &RepoAlias::new("foo"),
&ServerRepoConfig::new( &ServerRepoConfig::new(
"repo".to_string(), "repo".to_string(),
@ -182,7 +182,7 @@ mod repo_details {
#[test] #[test]
fn should_return_git_remote() { fn should_return_git_remote() {
let rd = RepoDetails::new( let rd = RepoDetails::new(
Generation::new(), Generation::default(),
&RepoAlias::new("foo"), &RepoAlias::new("foo"),
&ServerRepoConfig::new( &ServerRepoConfig::new(
"user/repo".to_string(), "user/repo".to_string(),
@ -327,7 +327,7 @@ pub mod given {
} }
pub fn repo_details(fs: &kxio::fs::FileSystem) -> git::RepoDetails { pub fn repo_details(fs: &kxio::fs::FileSystem) -> git::RepoDetails {
let generation = git::Generation::new(); let generation = git::Generation::default();
let repo_alias = a_repo_alias(); let repo_alias = a_repo_alias();
let server_repo_config = a_server_repo_config(); let server_repo_config = a_server_repo_config();
let forge_alias = a_forge_alias(); let forge_alias = a_forge_alias();

View file

@ -115,7 +115,7 @@ impl Handler<ServerConfig> for Server {
} }
impl Server { impl Server {
pub fn new(fs: FileSystem, net: Network, repo: Box<dyn RepositoryFactory>) -> Self { pub fn new(fs: FileSystem, net: Network, repo: Box<dyn RepositoryFactory>) -> Self {
let generation = Generation::new(); let generation = Generation::default();
Self { Self {
generation, generation,
webhook: None, webhook: None,

View file

@ -50,7 +50,7 @@ fn repo_details_find_default_push_remote_finds_correct_remote() -> Result<()> {
let_assert!(Some(Some(root)) = cli_crate_dir.parent().map(|p| p.parent())); let_assert!(Some(Some(root)) = cli_crate_dir.parent().map(|p| p.parent()));
let mut repo_details = git::common::repo_details( let mut repo_details = git::common::repo_details(
1, 1,
git::Generation::new(), git::Generation::default(),
config::common::forge_details(1, ForgeType::MockForge), config::common::forge_details(1, ForgeType::MockForge),
None, None,
GitDir::new(root), // Server GitDir - should be ignored GitDir::new(root), // Server GitDir - should be ignored
@ -81,7 +81,7 @@ fn gitdir_validate_should_pass_a_valid_git_repo() -> Result<()> {
let_assert!(Some(Some(root)) = cli_crate_dir.parent().map(|p| p.parent())); let_assert!(Some(Some(root)) = cli_crate_dir.parent().map(|p| p.parent()));
let mut repo_details = git::common::repo_details( let mut repo_details = git::common::repo_details(
1, 1,
git::Generation::new(), git::Generation::default(),
config::common::forge_details(1, ForgeType::MockForge), config::common::forge_details(1, ForgeType::MockForge),
None, None,
GitDir::new(root), // Server GitDir - should be ignored GitDir::new(root), // Server GitDir - should be ignored
@ -105,7 +105,7 @@ fn gitdir_validate_should_fail_a_git_repo_with_wrong_remote() -> Result<()> {
let_assert!(Some(Some(root)) = cli_crate_dir.parent().map(|p| p.parent())); let_assert!(Some(Some(root)) = cli_crate_dir.parent().map(|p| p.parent()));
let repo_details = git::common::repo_details( let repo_details = git::common::repo_details(
1, 1,
git::Generation::new(), git::Generation::default(),
config::common::forge_details(1, ForgeType::MockForge), config::common::forge_details(1, ForgeType::MockForge),
None, None,
GitDir::new(root), // Server GitDir - should be ignored GitDir::new(root), // Server GitDir - should be ignored