robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 09:04:12 +02:00
Code Issues Projects Releases Wiki Activity

clippy fixes

Browse source
This commit is contained in:
Robin Appelman 2023-05-04 18:53:38 +02:00
commit abe04b52d0
12 changed files with 101 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/git.rs
View file

@ -11,11 +11,11 @@ pub fn checkout_all<P: AsRef<Path>>(sources_root: P, branch: &str) -> Result<()>
let app = app.into_diagnostic()?;
if app.metadata().into_diagnostic()?.is_dir() {
let app_dir = app.path();
if has_branch(&app_dir, &branch).unwrap_or_default()
if has_branch(&app_dir, branch).unwrap_or_default()
&& get_branch(&app_dir).unwrap_or_default().trim() != branch
{
print!("{}", app.file_name().to_string_lossy());
if let Err(e) = checkout(&app_dir, &branch) {
if let Err(e) = checkout(&app_dir, branch) {
println!(": {} ❌", e);
} else {
println!(" ✓");
@ -39,7 +39,7 @@ fn has_branch<P: AsRef<Path>>(repo: P, branch: &str) -> Result<bool> {
error!(stdout = stdout, stderr = stderr, "git command failed");
}
for line in stdout.split("\n") {
for line in stdout.split('\n') {
let line = line.trim();
if line == branch {
return Ok(true);