From 2903b680dfba75c3c37f9c04edd3b592590e2a0c Mon Sep 17 00:00:00 2001 From: Scott Lamb Date: Tue, 11 Mar 2025 21:45:37 -0700 Subject: [PATCH] clippy fixes to tests --- server/db/auth.rs | 8 ++++---- server/db/db.rs | 11 +++++------ server/db/dir/mod.rs | 4 ++-- server/db/testutil.rs | 2 +- server/db/writer.rs | 4 +++- server/src/mp4.rs | 12 +++++------- server/src/slices.rs | 6 +----- server/src/streamer.rs | 7 +++---- server/src/web/mod.rs | 2 +- server/src/web/session.rs | 14 +++++++------- server/src/web/view.rs | 2 +- 11 files changed, 33 insertions(+), 39 deletions(-) diff --git a/server/db/auth.rs b/server/db/auth.rs index 80c5e49..ba74b62 100644 --- a/server/db/auth.rs +++ b/server/db/auth.rs @@ -1073,8 +1073,8 @@ mod tests { .unwrap(); assert_eq!(s.use_count, 1); - let mut tx = conn.transaction().unwrap(); - state.flush(&mut tx).unwrap(); + let tx = conn.transaction().unwrap(); + state.flush(&tx).unwrap(); tx.commit().unwrap(); state.post_flush(); @@ -1224,8 +1224,8 @@ mod tests { c.username = "foo".to_owned(); state.apply(&conn, c).unwrap(); - assert!(state.users_by_name.get("slamb").is_none()); - assert!(state.users_by_name.get("foo").is_some()); + assert!(!state.users_by_name.contains_key("slamb")); + assert!(state.users_by_name.contains_key("foo")); } #[test] diff --git a/server/db/db.rs b/server/db/db.rs index 3c7929f..011236c 100644 --- a/server/db/db.rs +++ b/server/db/db.rs @@ -650,7 +650,7 @@ pub struct CompositeId(pub i64); impl CompositeId { pub fn new(stream_id: i32, recording_id: i32) -> Self { - CompositeId((stream_id as i64) << 32 | recording_id as i64) + CompositeId(((stream_id as i64) << 32) | recording_id as i64) } pub fn stream(self) -> i32 { @@ -2519,7 +2519,7 @@ mod tests { rows = 0; { let db = db.lock(); - let all_time = recording::Time(i64::min_value())..recording::Time(i64::max_value()); + let all_time = recording::Time(i64::MIN)..recording::Time(i64::MAX); db.list_recordings_by_time(stream_id, all_time, &mut |_row| { rows += 1; Ok(()) @@ -2546,7 +2546,7 @@ mod tests { let mut recording_id = None; { let db = db.lock(); - let all_time = recording::Time(i64::min_value())..recording::Time(i64::max_value()); + let all_time = recording::Time(i64::MIN)..recording::Time(i64::MAX); db.list_recordings_by_time(stream_id, all_time, &mut |row| { rows += 1; recording_id = Some(row.id); @@ -2868,9 +2868,8 @@ mod tests { .get(&sample_file_dir_id) .unwrap() .garbage_unlinked - .iter() - .copied() - .collect(); + .to_vec(); + assert_eq!(&g, &[]); } diff --git a/server/db/dir/mod.rs b/server/db/dir/mod.rs index ab88614..cf09dc2 100644 --- a/server/db/dir/mod.rs +++ b/server/db/dir/mod.rs @@ -421,12 +421,12 @@ mod tests { meta.dir_uuid.extend_from_slice(fake_uuid); { let o = meta.last_complete_open.mut_or_insert_default(); - o.id = u32::max_value(); + o.id = u32::MAX; o.uuid.extend_from_slice(fake_uuid); } { let o = meta.in_progress_open.mut_or_insert_default(); - o.id = u32::max_value(); + o.id = u32::MAX; o.uuid.extend_from_slice(fake_uuid); } let data = meta diff --git a/server/db/testutil.rs b/server/db/testutil.rs index 9b9cce9..935dcf5 100644 --- a/server/db/testutil.rs +++ b/server/db/testutil.rs @@ -198,7 +198,7 @@ pub fn add_dummy_recordings_to_db(db: &db::Database, num: usize) { wall_duration_90k: 5399985, video_samples: 1800, video_sync_samples: 60, - video_sample_entry_id: video_sample_entry_id, + video_sample_entry_id, video_index: data, run_offset: 0, ..Default::default() diff --git a/server/db/writer.rs b/server/db/writer.rs index 0cfea33..cf70509 100644 --- a/server/db/writer.rs +++ b/server/db/writer.rs @@ -1106,6 +1106,8 @@ mod tests { enum MockFileAction { SyncAll(Box Result<(), io::Error> + Send>), + + #[allow(clippy::type_complexity)] Write(Box Result + Send>), } @@ -1263,7 +1265,7 @@ mod tests { &mut h.shutdown_rx, b"2", recording::Time(2), - i32::max_value() as i64 + 1, + i64::from(i32::MAX) + 1, true, video_sample_entry_id, ) diff --git a/server/src/mp4.rs b/server/src/mp4.rs index 4e18b6e..5c01df7 100644 --- a/server/src/mp4.rs +++ b/server/src/mp4.rs @@ -2009,7 +2009,6 @@ mod tests { use std::fs; use std::ops::Range; use std::path::Path; - use std::pin::Pin; use std::str; use tracing::info; @@ -2018,7 +2017,7 @@ mod tests { E::Error: ::std::fmt::Debug, { let mut p = 0; - Pin::from(e.get_range(start..start + slice.len() as u64)) + e.get_range(start..start + slice.len() as u64) .try_for_each(|mut chunk| { let len = chunk.remaining(); chunk.copy_to_slice(&mut slice[p..p + len]); @@ -2044,7 +2043,7 @@ mod tests { hasher.update(&b"\r\n"[..]); } hasher.update(&b"\r\n"[..]); - Pin::from(e.get_range(0..e.len())) + e.get_range(0..e.len()) .try_fold(hasher, |mut hasher, mut chunk| { while chunk.has_remaining() { let c = chunk.chunk(); @@ -2157,8 +2156,7 @@ mod tests { let interior = self.stack.last().expect("at root").interior.clone(); let len = (interior.end - interior.start) as usize; trace!("get_all: start={}, len={}", interior.start, len); - let mut out = Vec::with_capacity(len); - unsafe { out.set_len(len) }; + let mut out = vec![0; len]; fill_slice(&mut out[..], &self.mp4, interior.start).await; out } @@ -2350,7 +2348,7 @@ mod tests { builder .include_timestamp_subtitle_track(include_subtitles) .unwrap(); - let all_time = recording::Time(i64::min_value())..recording::Time(i64::max_value()); + let all_time = recording::Time(i64::MIN)..recording::Time(i64::MAX); { let db = tdb.db.lock(); db.list_recordings_by_time(TEST_STREAM_ID, all_time, &mut |r| { @@ -2381,7 +2379,7 @@ mod tests { .open(&filename) .unwrap(); use ::std::io::Write; - Pin::from(mp4.get_range(0..mp4.len())) + mp4.get_range(0..mp4.len()) .try_for_each(|mut chunk| { while chunk.has_remaining() { let c = chunk.chunk(); diff --git a/server/src/slices.rs b/server/src/slices.rs index 7111226..07e21c1 100644 --- a/server/src/slices.rs +++ b/server/src/slices.rs @@ -183,7 +183,6 @@ mod tests { use db::testutil; use futures::stream::{self, TryStreamExt}; use std::ops::Range; - use std::pin::Pin; #[derive(Debug, Eq, PartialEq)] pub struct FakeChunk { @@ -241,10 +240,7 @@ mod tests { async fn get_range(r: Range) -> Vec { let slices = slices(); - Pin::from(slices.get_range(&slices, r)) - .try_collect() - .await - .unwrap() + slices.get_range(&slices, r).try_collect().await.unwrap() } #[test] diff --git a/server/src/streamer.rs b/server/src/streamer.rs index 7d73235..4fdce52 100644 --- a/server/src/streamer.rs +++ b/server/src/streamer.rs @@ -355,7 +355,7 @@ mod tests { ); let duration = goal - self.slept; let buf_part = cmp::min(self.buffered, duration); - self.buffered = self.buffered - buf_part; + self.buffered -= buf_part; self.clocks.sleep(duration - buf_part); self.slept = goal; } @@ -440,8 +440,8 @@ mod tests { Box::new(stream), ); stream.ts_offset = 123456; // starting pts of the input should be irrelevant - stream.ts_offset_pkts_left = u32::max_value(); - stream.pkts_left = u32::max_value(); + stream.ts_offset_pkts_left = u32::MAX; + stream.pkts_left = u32::MAX; let (shutdown_tx, shutdown_rx) = base::shutdown::channel(); let opener = MockOpener { expected_url: url::Url::parse("rtsp://test-camera/main").unwrap(), @@ -516,7 +516,6 @@ mod tests { assert_eq!(recording::Time(128700576719993), recordings[1].start); assert_eq!(db::RecordingFlags::TrailingZero as i32, recordings[1].flags); - drop(env); drop(opener); } } diff --git a/server/src/web/mod.rs b/server/src/web/mod.rs index 58991da..f609295 100644 --- a/server/src/web/mod.rs +++ b/server/src/web/mod.rs @@ -755,7 +755,7 @@ mod tests { let s = Server::new(None); let cli = reqwest::Client::new(); let resp = cli - .get(&format!("{}/api/", &s.base_url)) + .get(format!("{}/api/", &s.base_url)) .send() .await .unwrap(); diff --git a/server/src/web/session.rs b/server/src/web/session.rs index 5a8de79..102209b 100644 --- a/server/src/web/session.rs +++ b/server/src/web/session.rs @@ -175,7 +175,7 @@ mod tests { info!("header: {}", cookie.header()); let resp = cli - .get(&format!("{}/api/", &s.base_url)) + .get(format!("{}/api/", &s.base_url)) .header(reqwest::header::COOKIE, cookie.header()) .send() .await @@ -192,7 +192,7 @@ mod tests { p.insert("username", "slamb"); p.insert("password", "hunter2"); let resp = cli - .post(&format!("{}/api/login", &s.base_url)) + .post(format!("{}/api/login", &s.base_url)) .json(&p) .send() .await @@ -202,7 +202,7 @@ mod tests { // A GET shouldn't work. let resp = cli - .get(&format!("{}/api/logout", &s.base_url)) + .get(format!("{}/api/logout", &s.base_url)) .header(reqwest::header::COOKIE, cookie.header()) .send() .await @@ -211,7 +211,7 @@ mod tests { // Neither should a POST without a csrf token. let resp = cli - .post(&format!("{}/api/logout", &s.base_url)) + .post(format!("{}/api/logout", &s.base_url)) .header(reqwest::header::COOKIE, cookie.header()) .send() .await @@ -221,7 +221,7 @@ mod tests { // But it should work with the csrf token. // Retrieve that from the toplevel API request. let toplevel: serde_json::Value = cli - .post(&format!("{}/api/", &s.base_url)) + .post(format!("{}/api/", &s.base_url)) .header(reqwest::header::COOKIE, cookie.header()) .send() .await @@ -240,7 +240,7 @@ mod tests { let mut p = FastHashMap::default(); p.insert("csrf", csrf); let resp = cli - .post(&format!("{}/api/logout", &s.base_url)) + .post(format!("{}/api/logout", &s.base_url)) .header(reqwest::header::COOKIE, cookie.header()) .json(&p) .send() @@ -255,7 +255,7 @@ mod tests { // It should also be invalidated server-side. let resp = cli - .get(&format!("{}/api/", &s.base_url)) + .get(format!("{}/api/", &s.base_url)) .header(reqwest::header::COOKIE, cookie.header()) .send() .await diff --git a/server/src/web/view.rs b/server/src/web/view.rs index 13c4300..bf7f048 100644 --- a/server/src/web/view.rs +++ b/server/src/web/view.rs @@ -291,7 +291,7 @@ mod tests { let s = Server::new(Some(permissions)); let cli = reqwest::Client::new(); let resp = cli - .get(&format!( + .get(format!( "{}/api/cameras/{}/main/view.mp4", &s.base_url, s.db.test_camera_uuid ))