summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2021-04-21 11:55:13 -0400
committerDan Davison <dandavison7@gmail.com>2021-04-24 16:43:24 -0400
commit2cc9b5d296f902704ab19eed308b3c145f9a89e6 (patch)
treee1cadcfeadf373231cc1a9fe2ff9b3f26b96772b
parent717a63ac9051694efeeccd1c619ac984f1259142 (diff)
Clippy
-rw-r--r--src/delta.rs2
-rw-r--r--src/parse.rs6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/delta.rs b/src/delta.rs
index 608b89c9..ac820de7 100644
--- a/src/delta.rs
+++ b/src/delta.rs
@@ -113,7 +113,7 @@ impl<'a> StateMachine<'a> {
let mut handled_line = if line.starts_with("commit ") {
self.handle_commit_meta_header_line()?
- } else if self.state == State::CommitMeta && line.starts_with(" ") {
+ } else if self.state == State::CommitMeta && line.starts_with(' ') {
self.handle_diff_stat_line()?
} else if line.starts_with("diff ") {
self.handle_file_meta_diff_line()?
diff --git a/src/parse.rs b/src/parse.rs
index a90323c3..167ae272 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -94,15 +94,13 @@ pub fn relativize_path_in_diff_stat_line(
{
if let Some(relative_path) = relative_path.to_str() {
let suffix = caps.get(2).unwrap().as_str();
- let pad_width = diff_stat_align_width
- .checked_sub(relative_path.len())
- .unwrap_or(0);
+ let pad_width = diff_stat_align_width.saturating_sub(relative_path.len());
let padding = " ".repeat(pad_width);
return Some(format!(" {}{}{}", relative_path, padding, suffix));
}
}
}
- return None;
+ None
}
pub fn get_file_extension_from_file_meta_line_file_path(path: &str) -> Option<&str> {