Skip to content

Commit

Permalink
Cleanup leftover clippy warnings in vendored dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
shssoichiro committed Oct 9, 2019
1 parent 8d6e229 commit 37e3b59
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions crates/nasm_rs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ fn get_output(cmd: &mut Command) -> Result<String, String> {
if out.status.success() {
Ok(String::from_utf8_lossy(&out.stdout).to_string())
} else {
Err(String::from_utf8_lossy(&out.stderr))?
Err(String::from_utf8_lossy(&out.stderr).to_string())
}
}

Expand All @@ -342,12 +342,12 @@ fn is_nasm_new_enough(nasm_path: &Path) -> Result<(), String> {
match get_output(Command::new(nasm_path).arg("-v")) {
Ok(version) => {
if version.contains("NASM version 0.") {
Err(version)?
Err(version)
} else {
Ok(())
}
}
Err(err) => Err(err)?,
Err(err) => Err(err),
}
}

Expand Down
2 changes: 1 addition & 1 deletion crates/vergen/src/output/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ fn run_command(command: &mut Command) -> String {
return String::from_utf8_lossy(&o.stdout).trim().to_owned();
}
}
return "UNKNOWN".to_owned();
"UNKNOWN".to_owned()
}

/// Build information keys.
Expand Down

0 comments on commit 37e3b59

Please sign in to comment.