MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-12-03 14:31:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

cargo clippy --fix

Browse Source 
This switches to inlining variable names into format args. clippy
now suggests this syntax, and I like it.
This commit is contained in:
Scott Lamb
2023-01-29 15:01:19 -08:00
parent 159e426943
commit a9430464b6
31 changed files with 119 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/db/upgrade/mod.rs
View File

@@ -35,7 +35,7 @@ pub struct Args<'a> {
fn set_journal_mode(conn: &rusqlite::Connection, requested: &str) -> Result<(), Error> {
assert!(!requested.contains(';')); // quick check for accidental sql injection.
let actual = conn.query_row(
&format!("pragma journal_mode = {}", requested),
&format!("pragma journal_mode = {requested}"),
params![],
|row| row.get::<_, String>(0),
)?;
@@ -191,12 +191,12 @@ mod tests {
let fresh = new_conn()?;
fresh.execute_batch(fresh_sql)?;
if let Some(diffs) = compare::get_diffs(
&format!("upgraded to version {}", ver),
&c,
&format!("fresh version {}", ver),
&format!("upgraded to version {ver}"),
c,
&format!("fresh version {ver}"),
&fresh,
)? {
panic!("Version {}: differences found:\n{}", ver, diffs);
panic!("Version {ver}: differences found:\n{diffs}");
}
Ok(())
}
@@ -284,14 +284,14 @@ mod tests {
] {
upgrade(
&Args {
sample_file_dir: Some(&tmpdir.path()),
sample_file_dir: Some(tmpdir.path()),
preset_journal: "delete",
no_vacuum: false,
},
*ver,
&mut upgraded,
)
.context(format!("upgrading to version {}", ver))?;
.context(format!("upgrading to version {ver}"))?;
if let Some(f) = fresh_sql {
compare(&upgraded, *ver, f)?;
}