From e9e8d48a6ea513e0a3a2e78a7a356ab9c2073c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Wed, 1 Jul 2020 00:01:09 +0200 Subject: [PATCH] fix clippy issues in tests and add it to CI --- .gitlab/CI/check.gitlab-ci.yml | 1 + common/src/comp/inventory/slot.rs | 4 ++-- network/src/message.rs | 6 +++--- network/src/metrics.rs | 8 ++++---- network/src/prios.rs | 25 +++++++++++++------------ network/src/types.rs | 2 +- network/tests/integration.rs | 8 ++++---- voxygen/tests/check_i18n_files.rs | 7 ++----- 8 files changed, 30 insertions(+), 31 deletions(-) diff --git a/.gitlab/CI/check.gitlab-ci.yml b/.gitlab/CI/check.gitlab-ci.yml index efebfb2918..167c5b69de 100644 --- a/.gitlab/CI/check.gitlab-ci.yml +++ b/.gitlab/CI/check.gitlab-ci.yml @@ -11,6 +11,7 @@ code-quality: script: - ln -s /dockercache/cache-all target - cargo clippy -- -D warnings + - cargo clippy --tests -- -D warnings - cargo fmt --all -- --check security: diff --git a/common/src/comp/inventory/slot.rs b/common/src/comp/inventory/slot.rs index 8bcf69edff..d993fef01a 100644 --- a/common/src/comp/inventory/slot.rs +++ b/common/src/comp/inventory/slot.rs @@ -384,7 +384,7 @@ mod tests { assert_eq!(sword, loadout.second_item); // Verify inventory - assert_eq!(inv.slots[0], Some(sword.clone().unwrap().item)); + assert_eq!(inv.slots[0], Some(sword.unwrap().item)); assert_eq!(inv.slots.len(), 1); } @@ -459,7 +459,7 @@ mod tests { // The swap should return the sword assert_eq!( - Some(sword.clone().unwrap().item), + Some(sword.unwrap().item), loadout_remove(EquipSlot::Mainhand, &mut loadout,) ); diff --git a/network/src/message.rs b/network/src/message.rs index e1460eaaab..fbfb9f3ae0 100644 --- a/network/src/message.rs +++ b/network/src/message.rs @@ -138,9 +138,9 @@ mod tests { assert_eq!(mb.data[0], 3); assert_eq!(mb.data[1], 0); assert_eq!(mb.data[7], 0); - assert_eq!(mb.data[8], 'a' as u8); + assert_eq!(mb.data[8], b'a'); assert_eq!(mb.data[8], 97); - assert_eq!(mb.data[9], 'b' as u8); - assert_eq!(mb.data[10], 'c' as u8); + assert_eq!(mb.data[9], b'b'); + assert_eq!(mb.data[10], b'c'); } } diff --git a/network/src/metrics.rs b/network/src/metrics.rs index eb875040f7..83d169642d 100644 --- a/network/src/metrics.rs +++ b/network/src/metrics.rs @@ -353,8 +353,8 @@ mod tests { #[test] fn pid_cid_frame_cache() { let pid = Pid::fake(1); - let frame1 = Frame::Raw("Foo".as_bytes().to_vec()); - let frame2 = Frame::Raw("Bar".as_bytes().to_vec()); + let frame1 = Frame::Raw(b"Foo".to_vec()); + let frame2 = Frame::Raw(b"Bar".to_vec()); let metrics = NetworkMetrics::new(&pid).unwrap(); let mut cache = PidCidFrameCache::new(metrics.frames_in_total, pid); let v1 = cache.with_label_values(1, &frame1); @@ -377,8 +377,8 @@ mod tests { #[test] fn cid_frame_cache() { let pid = Pid::fake(1); - let frame1 = Frame::Raw("Foo".as_bytes().to_vec()); - let frame2 = Frame::Raw("Bar".as_bytes().to_vec()); + let frame1 = Frame::Raw(b"Foo".to_vec()); + let frame2 = Frame::Raw(b"Bar".to_vec()); let metrics = NetworkMetrics::new(&pid).unwrap(); let mut cache = CidFrameCache::new(metrics.frames_wire_out_total, 1); let v1 = cache.with_label_values(&frame1); diff --git a/network/src/prios.rs b/network/src/prios.rs index aee7ffd2cc..ae30cf878c 100644 --- a/network/src/prios.rs +++ b/network/src/prios.rs @@ -327,6 +327,7 @@ mod tests { const SIZE: u64 = PrioManager::FRAME_DATA_SIZE; const USIZE: usize = PrioManager::FRAME_DATA_SIZE as usize; + #[allow(clippy::type_complexity)] fn mock_new() -> ( PrioManager, Sender<(Prio, Sid, OutgoingMessage)>, @@ -605,10 +606,10 @@ mod tests { fn gigantic_message() { let (mut mgr, msg_tx, _flush_tx) = mock_new(); let mut data = vec![1; USIZE]; - data.extend_from_slice(&vec![2; USIZE]); - data.extend_from_slice(&vec![3; USIZE]); - data.extend_from_slice(&vec![4; USIZE]); - data.extend_from_slice(&vec![5; USIZE]); + data.extend_from_slice(&[2; USIZE]); + data.extend_from_slice(&[3; USIZE]); + data.extend_from_slice(&[4; USIZE]); + data.extend_from_slice(&[5; USIZE]); let sid = Sid::new(2); msg_tx .send((16, sid, OutgoingMessage { @@ -634,10 +635,10 @@ mod tests { fn gigantic_message_order() { let (mut mgr, msg_tx, _flush_tx) = mock_new(); let mut data = vec![1; USIZE]; - data.extend_from_slice(&vec![2; USIZE]); - data.extend_from_slice(&vec![3; USIZE]); - data.extend_from_slice(&vec![4; USIZE]); - data.extend_from_slice(&vec![5; USIZE]); + data.extend_from_slice(&[2; USIZE]); + data.extend_from_slice(&[3; USIZE]); + data.extend_from_slice(&[4; USIZE]); + data.extend_from_slice(&[5; USIZE]); let sid = Sid::new(2); msg_tx .send((16, sid, OutgoingMessage { @@ -666,10 +667,10 @@ mod tests { fn gigantic_message_order_other_prio() { let (mut mgr, msg_tx, _flush_tx) = mock_new(); let mut data = vec![1; USIZE]; - data.extend_from_slice(&vec![2; USIZE]); - data.extend_from_slice(&vec![3; USIZE]); - data.extend_from_slice(&vec![4; USIZE]); - data.extend_from_slice(&vec![5; USIZE]); + data.extend_from_slice(&[2; USIZE]); + data.extend_from_slice(&[3; USIZE]); + data.extend_from_slice(&[4; USIZE]); + data.extend_from_slice(&[5; USIZE]); let sid = Sid::new(2); msg_tx .send((16, sid, OutgoingMessage { diff --git a/network/src/types.rs b/network/src/types.rs index fc0fb8c698..288a954293 100644 --- a/network/src/types.rs +++ b/network/src/types.rs @@ -322,7 +322,7 @@ mod tests { #[test] fn frame_get_int() { - assert_eq!(Frame::get_int(&Frame::Raw("Foo".as_bytes().to_vec())), 7); + assert_eq!(Frame::get_int(&Frame::Raw(b"Foo".to_vec())), 7); assert_eq!(Frame::get_int(&Frame::Shutdown), 2); } diff --git a/network/tests/integration.rs b/network/tests/integration.rs index fe40810eb3..6fe0dea42a 100644 --- a/network/tests/integration.rs +++ b/network/tests/integration.rs @@ -101,11 +101,11 @@ fn failed_listen_on_used_ports() -> std::result::Result<(), Box (), - _ => assert!(false), + _ => panic!(), }; match e2 { Err(NetworkError::ListenFailed(e)) if e.kind() == ErrorKind::AddrInUse => (), - _ => assert!(false), + _ => panic!(), }; Ok(()) } @@ -178,7 +178,7 @@ fn wrong_parse() { s1_a.send(1337).unwrap(); match block_on(s1_b.recv::()) { - Err(StreamError::DeserializeError(_)) => assert!(true), - _ => assert!(false, "this should fail, but it doesnt!"), + Err(StreamError::DeserializeError(_)) => (), + _ => panic!("this should fail, but it doesnt!"), } } diff --git a/voxygen/tests/check_i18n_files.rs b/voxygen/tests/check_i18n_files.rs index 350a2979c6..1fbbbd7b51 100644 --- a/voxygen/tests/check_i18n_files.rs +++ b/voxygen/tests/check_i18n_files.rs @@ -81,15 +81,12 @@ fn generate_key_version<'a>( .map(|k| (k.to_owned(), LocalizationEntryState::new())) .collect(); let mut to_process: HashSet<&String> = localization.string_map.keys().map(|k| k).collect(); - let mut line_nb = 0; - // Find key start lines - for line in std::str::from_utf8(file_blob.content()) + for (line_nb, line) in std::str::from_utf8(file_blob.content()) .expect("UTF-8 file") .split('\n') + .enumerate() { - line_nb += 1; - let mut found_key = None; for key in to_process.iter() {