diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-02 13:15:31 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-02 13:15:31 +0000 |
| commit | f9d47ab4f75da1818b9c727bbec2c073323d8c90 (patch) | |
| tree | aa0ba5f5c52a7599610c5c14538841cea125c993 | |
| parent | 536eae767a433bc42c60885e851be79faa78b7d0 (diff) | |
| download | pr-tracker-f9d47ab4f75da1818b9c727bbec2c073323d8c90.tar pr-tracker-f9d47ab4f75da1818b9c727bbec2c073323d8c90.tar.gz pr-tracker-f9d47ab4f75da1818b9c727bbec2c073323d8c90.tar.bz2 pr-tracker-f9d47ab4f75da1818b9c727bbec2c073323d8c90.tar.lz pr-tracker-f9d47ab4f75da1818b9c727bbec2c073323d8c90.tar.xz pr-tracker-f9d47ab4f75da1818b9c727bbec2c073323d8c90.tar.zst pr-tracker-f9d47ab4f75da1818b9c727bbec2c073323d8c90.zip | |
cargo fmt
| -rw-r--r-- | src/branches.rs | 28 | ||||
| -rw-r--r-- | src/tree.rs | 12 |
2 files changed, 22 insertions, 18 deletions
diff --git a/src/branches.rs b/src/branches.rs index 3ca3d0d..aa2c5b1 100644 --- a/src/branches.rs +++ b/src/branches.rs @@ -63,43 +63,43 @@ mod tests { #[test] fn staging_18_03() { - let res = next_branches("staging-18.03"); - assert_eq!(res, vec!["release-18.03"]); + let res = next_branches("staging-18.03"); + assert_eq!(res, vec!["release-18.03"]); } #[test] fn staging_20_09() { - let res = next_branches("staging-20.09"); - assert_eq!(res, vec!["release-20.09"]); + let res = next_branches("staging-20.09"); + assert_eq!(res, vec!["release-20.09"]); } #[test] fn staging_21_05() { - let res = next_branches("staging-21.05"); - assert_eq!(res, vec!["staging-next-21.05"]); + let res = next_branches("staging-21.05"); + assert_eq!(res, vec!["staging-next-21.05"]); } #[test] fn staging_30_05() { - let res = next_branches("staging-30.05"); - assert_eq!(res, vec!["staging-next-30.05"]); + let res = next_branches("staging-30.05"); + assert_eq!(res, vec!["staging-next-30.05"]); } #[test] fn staging_00_11() { - let res = next_branches("staging-00.11"); - assert_eq!(res, vec!["staging-next-00.11"]); + let res = next_branches("staging-00.11"); + assert_eq!(res, vec!["staging-next-00.11"]); } #[test] fn staging_next_21_05() { - let res = next_branches("staging-next-21.05"); - assert_eq!(res, vec!["release-21.05"]); + let res = next_branches("staging-next-21.05"); + assert_eq!(res, vec!["release-21.05"]); } #[test] fn release_20_09() { - let res = next_branches("release-20.09"); - assert_eq!(res, vec!["nixpkgs-20.09-darwin", "nixos-20.09-small"]); + let res = next_branches("release-20.09"); + assert_eq!(res, vec!["nixpkgs-20.09-darwin", "nixos-20.09-small"]); } } diff --git a/src/tree.rs b/src/tree.rs index f569dba..39cfcf0 100644 --- a/src/tree.rs +++ b/src/tree.rs @@ -46,7 +46,11 @@ impl Tree { } } - pub async fn make(base_branch: String, merge_status: &github::PullRequestStatus, nixpkgs: &Nixpkgs<'_>) -> Tree { + pub async fn make( + base_branch: String, + merge_status: &github::PullRequestStatus, + nixpkgs: &Nixpkgs<'_>, + ) -> Tree { let mut missing_means_absent = true; let mut branches = BTreeSet::new(); @@ -59,9 +63,9 @@ impl Tree { if let Some(merge_commit) = merge_commit_oid { let mut containing_commits = BTreeSet::new(); - if let Err(e) = - nixpkgs.branches_containing_commit(&merge_commit, &mut containing_commits) - .await + if let Err(e) = nixpkgs + .branches_containing_commit(&merge_commit, &mut containing_commits) + .await { eprintln!("pr-tracker: branches_containing_commit: {}", e); missing_means_absent = false; |