Skip to content

build_author_map(): remove unused from parameter #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanielEScherzer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build_author_map(): remove unused from parameter #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 8 additions & 20 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,24 +308,22 @@ fn commit_coauthors(commit: &Commit) -> Vec<Author> {
coauthors
}

/// Build up an [`AuthorMap`] of commits authored between `from` and `to`.
/// Build up an [`AuthorMap`] of commits authored up to and including `to`.
///
/// This function is a wrapper around [`build_author_map_`] to add additional
/// context to any errors; see that function for further documentation.
fn build_author_map(
repo: &Repository,
reviewers: &Reviewers,
mailmap: &Mailmap,
from: &str,
to: &str,
) -> Result<AuthorMap, Box<dyn std::error::Error>> {
match build_author_map_(repo, reviewers, mailmap, from, to) {
match build_author_map_(repo, reviewers, mailmap, to) {
Ok(o) => Ok(o),
Err(err) => Err(ErrorContext(
format!(
"build_author_map(repo={}, from={:?}, to={:?})",
"build_author_map(repo={}, to={:?})",
repo.path().display(),
from,
to
),
err,
Expand Down Expand Up @@ -457,11 +455,7 @@ fn parse_bors_reviewer(
Ok(Some(reviewers))
}

/// Build up an [`AuthorMap`] of commits authored between `from` and `to`.
///
/// If `from` is empty, commits authored up to and including `to` are processed.
/// If `from` is non-empty, commits starting *after* `from` are processed, up
/// to and including the `to` commit.
/// Build up an [`AuthorMap`] of commits authored up to and including `to`.
///
/// For each commit processed, authorship is added to the `AuthorMap` result
/// according to the following rules:
Expand All @@ -483,7 +477,6 @@ fn build_author_map_(
repo: &Repository,
reviewers: &Reviewers,
mailmap: &Mailmap,
from: &str,
to: &str,
) -> Result<AuthorMap, Box<dyn std::error::Error>> {
let mut walker = repo.revwalk()?;
Expand All @@ -499,12 +492,8 @@ fn build_author_map_(
])?;
}

if from == "" {
let to = repo.revparse_single(to)?.peel_to_commit()?.id();
walker.push(to)?;
} else {
walker.push_range(&format!("{}..{}", from, to))?;
}
let to = repo.revparse_single(to)?.peel_to_commit()?.id();
walker.push(to)?;

let mut author_map = AuthorMap::new();
for oid in walker {
Expand Down Expand Up @@ -579,7 +568,7 @@ fn up_to_release(
})?;
let modules = get_submodules(&repo, &to_commit)?;

let mut author_map = build_author_map(&repo, &reviewers, &mailmap, "", &to.raw_tag)
let mut author_map = build_author_map(&repo, &reviewers, &mailmap, &to.raw_tag)
.map_err(|e| ErrorContext(format!("Up to {}", to), e))?;

for module in &modules {
Expand All @@ -589,7 +578,6 @@ fn up_to_release(
&subrepo,
&reviewers,
&mailmap,
"",
&module.commit.to_string(),
)?;
author_map.extend(submap);
Expand Down Expand Up @@ -655,7 +643,7 @@ fn generate_thanks() -> Result<BTreeMap<VersionTag, AuthorMap>, Box<dyn std::err
let previous = if let Some(v) = idx.checked_sub(1).map(|idx| &versions[idx]) {
v
} else {
let author_map = build_author_map(&repo, &reviewers, &mailmap, "", &version.raw_tag)?;
let author_map = build_author_map(&repo, &reviewers, &mailmap, &version.raw_tag)?;
version_map.insert(version.clone(), author_map);
continue;
};
Expand Down