MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-11-27 12:53:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

clean up the easy clippy errors

Browse Source 
I'm still not running clippy on CI and probably should.
There are a few left that were a little more involved to address.
This commit is contained in:
Scott Lamb
2022-09-28 09:29:16 -07:00
parent b03eceb21a
commit 0866b23991
23 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/db/compare.rs
View File

@@ -67,12 +67,12 @@ fn diff_slices<T: std::fmt::Display + PartialEq>(
match item {
diff::Result::Left(i) => {
changed = true;
write!(&mut diff, "-{}\n", i)
writeln!(&mut diff, "-{}", i)
}
diff::Result::Both(i, _) => write!(&mut diff, " {}\n", i),
diff::Result::Both(i, _) => writeln!(&mut diff, " {}", i),
diff::Result::Right(i) => {
changed = true;
write!(&mut diff, "+{}\n", i)
writeln!(&mut diff, "+{}", i)
}
}
.unwrap();
@@ -177,8 +177,8 @@ pub fn get_diffs(
// Compare columns and indices for each table.
for t in &tables1 {
let columns1 = get_table_columns(c1, &t)?;
let columns2 = get_table_columns(c2, &t)?;
let columns1 = get_table_columns(c1, t)?;
let columns2 = get_table_columns(c2, t)?;
if let Some(diff) = diff_slices(n1, &columns1[..], n2, &columns2[..]) {
write!(
&mut diffs,
@@ -187,8 +187,8 @@ pub fn get_diffs(
)?;
}
let mut indices1 = get_indices(c1, &t)?;
let mut indices2 = get_indices(c2, &t)?;
let mut indices1 = get_indices(c1, t)?;
let mut indices2 = get_indices(c2, t)?;
indices1.sort_by(|a, b| a.name.cmp(&b.name));
indices2.sort_by(|a, b| a.name.cmp(&b.name));
if let Some(diff) = diff_slices(n1, &indices1[..], n2, &indices2[..]) {