Skip to content

Commit 94bd5bd

Browse files
committed
Remove pub access in commit_diff
1 parent 2b508d2 commit 94bd5bd

File tree

4 files changed

+58
-27
lines changed

4 files changed

+58
-27
lines changed

src/git/commit.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ impl Commit {
2424

2525
/// Get the reference to the commit
2626
#[must_use]
27+
#[allow(dead_code)]
2728
pub(crate) const fn reference(&self) -> &Option<Reference> {
2829
&self.reference
2930
}
@@ -36,6 +37,7 @@ impl Commit {
3637

3738
/// Get the author of the commit.
3839
#[must_use]
40+
#[allow(dead_code)]
3941
pub(crate) const fn authored_date(&self) -> &Option<DateTime<Local>> {
4042
&self.authored_date
4143
}

src/git/commit_diff.rs

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,33 @@ use crate::git::{Commit, FileStatus};
33
/// Represents a commit with a diff
44
#[derive(Debug)]
55
pub(crate) struct CommitDiff {
6-
pub(crate) commit: Commit,
7-
pub(crate) parent: Option<Commit>,
8-
pub(crate) file_statuses: Vec<FileStatus>,
9-
pub(crate) number_files_changed: usize,
10-
pub(crate) number_insertions: usize,
11-
pub(crate) number_deletions: usize,
6+
commit: Commit,
7+
parent: Option<Commit>,
8+
file_statuses: Vec<FileStatus>,
9+
number_files_changed: usize,
10+
number_insertions: usize,
11+
number_deletions: usize,
1212
}
1313

1414
impl CommitDiff {
15+
pub(crate) fn new(
16+
commit: Commit,
17+
parent: Option<Commit>,
18+
file_statuses: Vec<FileStatus>,
19+
number_files_changed: usize,
20+
number_insertions: usize,
21+
number_deletions: usize,
22+
) -> Self {
23+
CommitDiff {
24+
commit,
25+
parent,
26+
file_statuses,
27+
number_files_changed,
28+
number_insertions,
29+
number_deletions,
30+
}
31+
}
32+
1533
/// The commit of the diff
1634
#[must_use]
1735
pub(crate) const fn commit(&self) -> &Commit {
@@ -20,6 +38,7 @@ impl CommitDiff {
2038

2139
/// The parent commit for the diff
2240
#[must_use]
41+
#[allow(dead_code)]
2342
pub(crate) const fn parent(&self) -> &Option<Commit> {
2443
&self.parent
2544
}

src/git/commit_diff_loader.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ impl<'options> CommitDiffLoader<'options> {
145145

146146
let fsb = file_stats_builder.into_inner();
147147

148-
Ok(CommitDiff {
149-
commit: Commit::from(commit),
150-
parent: parent.map(Commit::from),
151-
file_statuses: fsb.build(),
148+
Ok(CommitDiff::new(
149+
Commit::from(commit),
150+
parent.map(Commit::from),
151+
fsb.build(),
152152
number_files_changed,
153153
number_insertions,
154154
number_deletions,
155-
})
155+
))
156156
}
157157
}
158158

src/test_helpers/builders/commit_diff.rs

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,73 +3,83 @@ use crate::git::{Commit, CommitDiff, FileStatus};
33
/// Builder for creating a new commit diff.
44
#[derive(Debug)]
55
pub(crate) struct CommitDiffBuilder {
6-
commit_diff: CommitDiff,
6+
commit: Commit,
7+
parent: Option<Commit>,
8+
file_statuses: Vec<FileStatus>,
9+
number_files_changed: usize,
10+
number_insertions: usize,
11+
number_deletions: usize,
712
}
813

914
impl CommitDiffBuilder {
1015
/// Create a new instance.
1116
#[must_use]
1217
pub(crate) const fn new(commit: Commit) -> Self {
1318
Self {
14-
commit_diff: CommitDiff {
15-
commit,
16-
parent: None,
17-
file_statuses: vec![],
18-
number_files_changed: 0,
19-
number_insertions: 0,
20-
number_deletions: 0,
21-
},
19+
commit,
20+
parent: None,
21+
file_statuses: vec![],
22+
number_files_changed: 0,
23+
number_insertions: 0,
24+
number_deletions: 0,
2225
}
2326
}
2427

2528
/// Set the commit.
2629
#[must_use]
2730
#[allow(clippy::missing_const_for_fn)]
2831
pub(crate) fn commit(mut self, commit: Commit) -> Self {
29-
self.commit_diff.commit = commit;
32+
self.commit = commit;
3033
self
3134
}
3235

3336
/// Set the parent commit.
3437
#[must_use]
3538
#[allow(clippy::missing_const_for_fn)]
3639
pub(crate) fn parent(mut self, parent: Commit) -> Self {
37-
self.commit_diff.parent = Some(parent);
40+
self.parent = Some(parent);
3841
self
3942
}
4043

4144
/// Set the `FileStatus`es.
4245
#[must_use]
4346
pub(crate) fn file_statuses(mut self, statuses: Vec<FileStatus>) -> Self {
44-
self.commit_diff.file_statuses = statuses;
47+
self.file_statuses = statuses;
4548
self
4649
}
4750

4851
/// Set the number of files changed.
4952
#[must_use]
5053
pub(crate) const fn number_files_changed(mut self, count: usize) -> Self {
51-
self.commit_diff.number_files_changed = count;
54+
self.number_files_changed = count;
5255
self
5356
}
5457

5558
/// Set the number of line insertions.
5659
#[must_use]
5760
pub(crate) const fn number_insertions(mut self, count: usize) -> Self {
58-
self.commit_diff.number_insertions = count;
61+
self.number_insertions = count;
5962
self
6063
}
6164

6265
/// Set the number of line deletions.
6366
#[must_use]
6467
pub(crate) const fn number_deletions(mut self, count: usize) -> Self {
65-
self.commit_diff.number_deletions = count;
68+
self.number_deletions = count;
6669
self
6770
}
6871

6972
/// Return the built `CommitDiff`
7073
#[must_use]
7174
#[allow(clippy::missing_const_for_fn)]
7275
pub(crate) fn build(self) -> CommitDiff {
73-
self.commit_diff
76+
CommitDiff::new(
77+
self.commit,
78+
self.parent,
79+
self.file_statuses,
80+
self.number_files_changed,
81+
self.number_insertions,
82+
self.number_deletions,
83+
)
7484
}
7585
}

0 commit comments

Comments
 (0)