diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2025-07-16 10:59:20 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2025-07-16 10:59:20 +0100 |
| commit | ac53bca7e315848864ff9e51703720b5b466bc42 (patch) | |
| tree | 775e425f0af2543eb12e4a4b1d4feb022611368f /src/lib/git | |
| parent | 092b9606ff2b721d858a5c7b2b27a2f9942b4bc4 (diff) | |
chore: bump nightly rustfmt
to latest available and apply fmt fixes
Diffstat (limited to 'src/lib/git')
| -rw-r--r-- | src/lib/git/identify_ahead_behind.rs | 8 | ||||
| -rw-r--r-- | src/lib/git/mod.rs | 83 |
2 files changed, 51 insertions, 40 deletions
diff --git a/src/lib/git/identify_ahead_behind.rs b/src/lib/git/identify_ahead_behind.rs index baea687..d736522 100644 --- a/src/lib/git/identify_ahead_behind.rs +++ b/src/lib/git/identify_ahead_behind.rs | |||
| @@ -184,10 +184,10 @@ mod tests { | |||
| 184 | identify_ahead_behind(&git_repo, &Some("feature".to_string()), &None)?; | 184 | identify_ahead_behind(&git_repo, &Some("feature".to_string()), &None)?; |
| 185 | 185 | ||
| 186 | assert_eq!(from_branch, "feature"); | 186 | assert_eq!(from_branch, "feature"); |
| 187 | assert_eq!(ahead, vec![ | 187 | assert_eq!( |
| 188 | oid_to_sha1(&feature_oid), | 188 | ahead, |
| 189 | oid_to_sha1(&dev_oid_first) | 189 | vec![oid_to_sha1(&feature_oid), oid_to_sha1(&dev_oid_first)] |
| 190 | ]); | 190 | ); |
| 191 | assert_eq!(to_branch, "main"); | 191 | assert_eq!(to_branch, "main"); |
| 192 | assert_eq!(behind, vec![]); | 192 | assert_eq!(behind, vec![]); |
| 193 | 193 | ||
diff --git a/src/lib/git/mod.rs b/src/lib/git/mod.rs index 464990b..d4bf2f5 100644 --- a/src/lib/git/mod.rs +++ b/src/lib/git/mod.rs | |||
| @@ -1490,10 +1490,10 @@ mod tests { | |||
| 1490 | &oid_to_sha1(&feature_oid), | 1490 | &oid_to_sha1(&feature_oid), |
| 1491 | )?; | 1491 | )?; |
| 1492 | assert_eq!(ahead, vec![]); | 1492 | assert_eq!(ahead, vec![]); |
| 1493 | assert_eq!(behind, vec![ | 1493 | assert_eq!( |
| 1494 | oid_to_sha1(&behind_2_oid), | 1494 | behind, |
| 1495 | oid_to_sha1(&behind_1_oid), | 1495 | vec![oid_to_sha1(&behind_2_oid), oid_to_sha1(&behind_1_oid),], |
| 1496 | ],); | 1496 | ); |
| 1497 | Ok(()) | 1497 | Ok(()) |
| 1498 | } | 1498 | } |
| 1499 | 1499 | ||
| @@ -1515,10 +1515,10 @@ mod tests { | |||
| 1515 | &oid_to_sha1(&main_oid), | 1515 | &oid_to_sha1(&main_oid), |
| 1516 | &oid_to_sha1(&ahead_2_oid), | 1516 | &oid_to_sha1(&ahead_2_oid), |
| 1517 | )?; | 1517 | )?; |
| 1518 | assert_eq!(ahead, vec![ | 1518 | assert_eq!( |
| 1519 | oid_to_sha1(&ahead_2_oid), | 1519 | ahead, |
| 1520 | oid_to_sha1(&ahead_1_oid), | 1520 | vec![oid_to_sha1(&ahead_2_oid), oid_to_sha1(&ahead_1_oid),], |
| 1521 | ],); | 1521 | ); |
| 1522 | assert_eq!(behind, vec![]); | 1522 | assert_eq!(behind, vec![]); |
| 1523 | Ok(()) | 1523 | Ok(()) |
| 1524 | } | 1524 | } |
| @@ -1547,14 +1547,14 @@ mod tests { | |||
| 1547 | &oid_to_sha1(&behind_2_oid), | 1547 | &oid_to_sha1(&behind_2_oid), |
| 1548 | &oid_to_sha1(&ahead_2_oid), | 1548 | &oid_to_sha1(&ahead_2_oid), |
| 1549 | )?; | 1549 | )?; |
| 1550 | assert_eq!(ahead, vec![ | 1550 | assert_eq!( |
| 1551 | oid_to_sha1(&ahead_2_oid), | 1551 | ahead, |
| 1552 | oid_to_sha1(&ahead_1_oid) | 1552 | vec![oid_to_sha1(&ahead_2_oid), oid_to_sha1(&ahead_1_oid)], |
| 1553 | ],); | 1553 | ); |
| 1554 | assert_eq!(behind, vec![ | 1554 | assert_eq!( |
| 1555 | oid_to_sha1(&behind_2_oid), | 1555 | behind, |
| 1556 | oid_to_sha1(&behind_1_oid) | 1556 | vec![oid_to_sha1(&behind_2_oid), oid_to_sha1(&behind_1_oid)], |
| 1557 | ],); | 1557 | ); |
| 1558 | Ok(()) | 1558 | Ok(()) |
| 1559 | } | 1559 | } |
| 1560 | } | 1560 | } |
| @@ -2209,9 +2209,10 @@ mod tests { | |||
| 2209 | test_repo.populate_with_test_branch()?; | 2209 | test_repo.populate_with_test_branch()?; |
| 2210 | test_repo.checkout("main")?; | 2210 | test_repo.checkout("main")?; |
| 2211 | 2211 | ||
| 2212 | assert_eq!(git_repo.parse_starting_commits("HEAD~1")?, vec![ | 2212 | assert_eq!( |
| 2213 | str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")? | 2213 | git_repo.parse_starting_commits("HEAD~1")?, |
| 2214 | ],); | 2214 | vec![str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?], |
| 2215 | ); | ||
| 2215 | Ok(()) | 2216 | Ok(()) |
| 2216 | } | 2217 | } |
| 2217 | 2218 | ||
| @@ -2221,9 +2222,10 @@ mod tests { | |||
| 2221 | let git_repo = Repo::from_path(&test_repo.dir)?; | 2222 | let git_repo = Repo::from_path(&test_repo.dir)?; |
| 2222 | test_repo.populate_with_test_branch()?; | 2223 | test_repo.populate_with_test_branch()?; |
| 2223 | 2224 | ||
| 2224 | assert_eq!(git_repo.parse_starting_commits("HEAD~1")?, vec![ | 2225 | assert_eq!( |
| 2225 | str_to_sha1("82ff2bcc9aa94d1bd8faee723d4c8cc190d6061c")? | 2226 | git_repo.parse_starting_commits("HEAD~1")?, |
| 2226 | ],); | 2227 | vec![str_to_sha1("82ff2bcc9aa94d1bd8faee723d4c8cc190d6061c")?], |
| 2228 | ); | ||
| 2227 | Ok(()) | 2229 | Ok(()) |
| 2228 | } | 2230 | } |
| 2229 | } | 2231 | } |
| @@ -2237,10 +2239,13 @@ mod tests { | |||
| 2237 | test_repo.populate_with_test_branch()?; | 2239 | test_repo.populate_with_test_branch()?; |
| 2238 | test_repo.checkout("main")?; | 2240 | test_repo.checkout("main")?; |
| 2239 | 2241 | ||
| 2240 | assert_eq!(git_repo.parse_starting_commits("HEAD~2")?, vec![ | 2242 | assert_eq!( |
| 2241 | str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?, | 2243 | git_repo.parse_starting_commits("HEAD~2")?, |
| 2242 | str_to_sha1("af474d8d271490e5c635aad337abdc050034b16a")?, | 2244 | vec![ |
| 2243 | ],); | 2245 | str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?, |
| 2246 | str_to_sha1("af474d8d271490e5c635aad337abdc050034b16a")?, | ||
| 2247 | ], | ||
| 2248 | ); | ||
| 2244 | Ok(()) | 2249 | Ok(()) |
| 2245 | } | 2250 | } |
| 2246 | } | 2251 | } |
| @@ -2253,11 +2258,14 @@ mod tests { | |||
| 2253 | let git_repo = Repo::from_path(&test_repo.dir)?; | 2258 | let git_repo = Repo::from_path(&test_repo.dir)?; |
| 2254 | test_repo.populate_with_test_branch()?; | 2259 | test_repo.populate_with_test_branch()?; |
| 2255 | 2260 | ||
| 2256 | assert_eq!(git_repo.parse_starting_commits("HEAD~3")?, vec![ | 2261 | assert_eq!( |
| 2257 | str_to_sha1("82ff2bcc9aa94d1bd8faee723d4c8cc190d6061c")?, | 2262 | git_repo.parse_starting_commits("HEAD~3")?, |
| 2258 | str_to_sha1("a23e6b05aaeb7d1471b4a838b51f337d5644eeb0")?, | 2263 | vec![ |
| 2259 | str_to_sha1("7ab82116068982671a8111f27dc10599172334b2")?, | 2264 | str_to_sha1("82ff2bcc9aa94d1bd8faee723d4c8cc190d6061c")?, |
| 2260 | ],); | 2265 | str_to_sha1("a23e6b05aaeb7d1471b4a838b51f337d5644eeb0")?, |
| 2266 | str_to_sha1("7ab82116068982671a8111f27dc10599172334b2")?, | ||
| 2267 | ], | ||
| 2268 | ); | ||
| 2261 | Ok(()) | 2269 | Ok(()) |
| 2262 | } | 2270 | } |
| 2263 | } | 2271 | } |
| @@ -2271,11 +2279,14 @@ mod tests { | |||
| 2271 | test_repo.populate_with_test_branch()?; | 2279 | test_repo.populate_with_test_branch()?; |
| 2272 | test_repo.checkout("main")?; | 2280 | test_repo.checkout("main")?; |
| 2273 | 2281 | ||
| 2274 | assert_eq!(git_repo.parse_starting_commits("af474d8..a23e6b0")?, vec![ | 2282 | assert_eq!( |
| 2275 | str_to_sha1("a23e6b05aaeb7d1471b4a838b51f337d5644eeb0")?, | 2283 | git_repo.parse_starting_commits("af474d8..a23e6b0")?, |
| 2276 | str_to_sha1("7ab82116068982671a8111f27dc10599172334b2")?, | 2284 | vec![ |
| 2277 | str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?, | 2285 | str_to_sha1("a23e6b05aaeb7d1471b4a838b51f337d5644eeb0")?, |
| 2278 | ],); | 2286 | str_to_sha1("7ab82116068982671a8111f27dc10599172334b2")?, |
| 2287 | str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?, | ||
| 2288 | ], | ||
| 2289 | ); | ||
| 2279 | Ok(()) | 2290 | Ok(()) |
| 2280 | } | 2291 | } |
| 2281 | } | 2292 | } |