From 6a2673ed2b33400fb3504c00c2cd9ca7bd197e60 Mon Sep 17 00:00:00 2001 From: Caleb Cox Date: Sun, 11 Feb 2024 11:34:04 -0600 Subject: [PATCH] Fix clippy lints in tests --- .github/workflows/test.yml | 2 +- src/main.rs | 2 +- src/mocks.rs | 12 ++++-------- src/registry.rs | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb30652..8a34400 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,4 +60,4 @@ jobs: - uses: actions-rs/cargo@v1 with: command: clippy - args: -- -D warnings + args: --all-targets -- -D warnings diff --git a/src/main.rs b/src/main.rs index 0bc5cf1..c9d4af1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -441,7 +441,7 @@ mod tests { let cleaned_projects = cleanup(&mocked_deps, &mut registry).unwrap(); assert_eq!(cleaned_projects.len(), 1); - assert_eq!(cleaned_projects.get(0).unwrap().0, String::from("app3")); + assert_eq!(cleaned_projects.first().unwrap().0, String::from("app3")); } #[test] diff --git a/src/mocks.rs b/src/mocks.rs index c53712b..d65f43a 100644 --- a/src/mocks.rs +++ b/src/mocks.rs @@ -12,11 +12,7 @@ use unimock::{matching, Clause, MockFn, Unimock}; pub fn args_mock(args: &str) -> impl Clause { ArgsMock .each_call(matching!()) - .returns( - args.split(' ') - .map(|arg| String::from(arg)) - .collect::>(), - ) + .returns(args.split(' ').map(String::from).collect::>()) .n_times(1) } @@ -28,17 +24,17 @@ pub fn choose_port_mock() -> impl Clause { } pub fn cwd_mock(project: &str) -> impl Clause { - let path = PathBuf::from(format!("/projects/{}", project)); + let path = PathBuf::from(format!("/projects/{project}")); WorkingDirectoryMock .each_call(matching!()) - .answers(move |_| Ok(path.clone())) + .answers(move |()| Ok(path.clone())) .at_least_times(1) } pub fn data_dir_mock() -> impl Clause { DataDirMock .each_call(matching!()) - .answers(|_| Ok(std::path::PathBuf::from("/data"))) + .answers(|()| Ok(std::path::PathBuf::from("/data"))) .at_least_times(1) } diff --git a/src/registry.rs b/src/registry.rs index 63dabc3..fffe6cf 100644 --- a/src/registry.rs +++ b/src/registry.rs @@ -241,7 +241,7 @@ impl Registry { bail!("Project {project_name} does not exist"); } - for (name, project) in &mut self.projects.iter_mut() { + for (name, project) in &mut self.projects { if project.port == linked_port { // Take the port from the project so that it can be used by the linked port project.port = self.allocator.allocate(deps, None)?; @@ -598,7 +598,7 @@ linked_port = 3000", assert!(registry .create( &mocked_deps, - &"app4", + "app4", Some(PathBuf::from("/projects/app3")), None, )