Fix clippy warnings in tests

trane-project · Apr 27, 2024 · 0dd9730 · 0dd9730
1 parent 78b3b00
commit 0dd9730
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/src/blacklist.rs b/src/blacklist.rs
@@ -259,7 +259,7 @@ mod test {
         // Remove the units with the prefix "a" and verify only those are removed.
         blacklist.remove_prefix_from_blacklist("a").unwrap();
         for unit in units {
-            if unit.as_str().starts_with("a") {
+            if unit.as_str().starts_with('a') {
                 assert!(!blacklist.blacklisted(unit).unwrap());
             } else {
                 assert!(blacklist.blacklisted(unit).unwrap());

diff --git a/src/course_builder/knowledge_base_builder.rs b/src/course_builder/knowledge_base_builder.rs
@@ -668,7 +668,7 @@ mod test {
         let dummy_dir = temp_dir.path().join("1.lesson").join("dummy");
         fs::create_dir_all(&dummy_dir)?;
         assert!(dummy_dir.exists());
-        simple_course.build(&temp_dir.path())?;
+        simple_course.build(temp_dir.path())?;
         assert!(!dummy_dir.exists());
 
         // Verify that the first lesson was built correctly.
@@ -799,7 +799,7 @@ mod test {
 
         // Verify that the course builder fails.
         let temp_dir = tempfile::tempdir()?;
-        assert!(simple_course.build(&temp_dir.path()).is_err());
+        assert!(simple_course.build(temp_dir.path()).is_err());
         Ok(())
     }
 
@@ -843,7 +843,7 @@ mod test {
 
         // Verify that the course builder fails.
         let temp_dir = tempfile::tempdir()?;
-        assert!(simple_course.build(&temp_dir.path()).is_err());
+        assert!(simple_course.build(temp_dir.path()).is_err());
         Ok(())
     }
 
@@ -880,7 +880,7 @@ mod test {
 
         // Verify that the course builder fails.
         let temp_dir = tempfile::tempdir()?;
-        assert!(simple_course.build(&temp_dir.path()).is_err());
+        assert!(simple_course.build(temp_dir.path()).is_err());
         Ok(())
     }
 
@@ -906,7 +906,7 @@ mod test {
                 dependencies: vec![],
                 superseded: vec![],
                 exercises: vec![SimpleKnowledgeBaseExercise {
-                    short_id: "".into(),
+                    short_id: String::new(),
                     front: vec!["Lesson 1, Exercise 1 front".into()],
                     back: vec![],
                 }],
@@ -917,7 +917,7 @@ mod test {
 
         // Verify that the course builder fails.
         let temp_dir = tempfile::tempdir()?;
-        assert!(simple_course.build(&temp_dir.path()).is_err());
+        assert!(simple_course.build(temp_dir.path()).is_err());
         Ok(())
     }
 }
diff --git a/src/data/course_generator/knowledge_base.rs b/src/data/course_generator/knowledge_base.rs
@@ -985,7 +985,7 @@ mod test {
                 .to_string()
         );
         assert_eq!(
-            exercise.back_file.to_owned().unwrap_or_default(),
+            exercise.back_file.clone().unwrap_or_default(),
             lesson_dir.join("ex1.back.md").to_str().unwrap().to_string()
         );
         Ok(())

diff --git a/src/data/course_generator/transcription.rs b/src/data/course_generator/transcription.rs
@@ -866,13 +866,13 @@ mod test {
         let asset_id = "asset_id";
         let passage_id = 2;
         assert_eq!(
-            TranscriptionConfig::exercise_id(lesson_id, &asset_id, Some(passage_id)),
+            TranscriptionConfig::exercise_id(lesson_id, asset_id, Some(passage_id)),
             Ustr::from("lesson_id::asset_id::2")
         );
 
         // Generate the ID for an exercise with the default passage.
         assert_eq!(
-            TranscriptionConfig::exercise_id(lesson_id, &asset_id, None),
+            TranscriptionConfig::exercise_id(lesson_id, asset_id, None),
             Ustr::from("lesson_id::asset_id")
         );
     }
@@ -1032,7 +1032,7 @@ mod test {
             skip_singing_lessons: false,
             skip_advanced_lessons: false,
         };
-        let passages = config.open_passage_directory(&temp_dir.path())?;
+        let passages = config.open_passage_directory(temp_dir.path())?;
         assert_eq!(2, passages.len());
 
         Ok(())
@@ -1046,13 +1046,13 @@ mod test {
 
         // Open the empty passages directory and verify there are no passages.
         let config = TranscriptionConfig {
-            passage_directory: "".into(),
+            passage_directory: String::new(),
             inlined_passages: vec![],
             transcription_dependencies: vec![],
             skip_singing_lessons: false,
             skip_advanced_lessons: false,
         };
-        let passages = config.open_passage_directory(&temp_dir.path())?;
+        let passages = config.open_passage_directory(temp_dir.path())?;
         assert!(passages.is_empty());
 
         Ok(())
@@ -1102,7 +1102,7 @@ mod test {
             skip_singing_lessons: false,
             skip_advanced_lessons: false,
         };
-        let result = config.open_passage_directory(&temp_dir.path());
+        let result = config.open_passage_directory(temp_dir.path());
         assert!(result.is_err());
         Ok(())
     }
@@ -1121,7 +1121,7 @@ mod test {
             skip_singing_lessons: false,
             skip_advanced_lessons: false,
         };
-        let result = config.open_passage_directory(&temp_dir.path());
+        let result = config.open_passage_directory(temp_dir.path());
         assert!(result.is_err());
         Ok(())
     }

diff --git a/src/data/music/notes.rs b/src/data/music/notes.rs
@@ -132,12 +132,12 @@ mod test {
         );
     }
 
-    /// Verifies that notes can be cloned. Done to ensure that the auto-generated trait
-    /// implementation is included in the code coverage report.
-    #[test]
-    fn note_clone() {
-        let note = Note(NaturalNote::A, Accidental::Natural);
-        let clone = note.clone();
-        assert_eq!(note, clone);
-    }
+    // /// Verifies that notes can be cloned. Done to ensure that the auto-generated trait
+    // /// implementation is included in the code coverage report.
+    // #[test]
+    // fn note_clone() {
+    //     let note = Note(NaturalNote::A, Accidental::Natural);
+    //     let clone = note.clone();
+    //     assert_eq!(note, clone);
+    // }
 }
diff --git a/src/repository_manager.rs b/src/repository_manager.rs
@@ -282,7 +282,7 @@ mod test {
         let metadata_dir = library_root
             .join(TRANE_CONFIG_DIR_PATH)
             .join(REPOSITORY_DIRECTORY);
-        fs::create_dir_all(&metadata_dir)?;
+        fs::create_dir_all(metadata_dir)?;
         Ok(())
     }
 
@@ -309,7 +309,7 @@ mod test {
             .path()
             .join(TRANE_CONFIG_DIR_PATH)
             .join(REPOSITORY_DIRECTORY)
-            .join(format!("{}.json", REPO_ID))
+            .join(format!("{REPO_ID}.json"))
             .exists());
         Ok(())
     }
@@ -367,9 +367,9 @@ mod test {
         setup_directories(library_root.path())?;
         let mut manager = LocalRepositoryManager::new(library_root.path())?;
         let download_dir = library_root.path().join(DOWNLOAD_DIRECTORY);
-        fs::create_dir_all(&download_dir)?;
+        fs::create_dir_all(download_dir)?;
         let repo_dir = library_root.path().join(DOWNLOAD_DIRECTORY).join(REPO_ID);
-        fs::File::create(&repo_dir)?;
+        fs::File::create(repo_dir)?;
         assert!(manager.add_repo(REPO_URL, None).is_err());
         Ok(())
     }
@@ -383,7 +383,7 @@ mod test {
         let download_dir = library_root.path().join(DOWNLOAD_DIRECTORY);
         fs::create_dir_all(&download_dir)?;
         // Set permissions to 0 so that the download directory cannot be created.
-        fs::set_permissions(&download_dir, fs::Permissions::from_mode(0))?;
+        fs::set_permissions(&download_dir, fs::Permissions::from_mode(0o0))?;
 
         assert!(manager.add_repo(REPO_URL, None).is_err());
         Ok(())
@@ -407,7 +407,7 @@ mod test {
             .path()
             .join(TRANE_CONFIG_DIR_PATH)
             .join(REPOSITORY_DIRECTORY)
-            .join(format!("{}.json", REPO_ID))
+            .join(format!("{REPO_ID}.json"))
             .exists());
         Ok(())
     }
@@ -531,7 +531,7 @@ mod test {
         let mut manager = LocalRepositoryManager::new(library_root.path())?;
         manager.add_repo(REPO_URL, None)?;
         let repo_dir = library_root.path().join(DOWNLOAD_DIRECTORY).join(REPO_ID);
-        fs::remove_dir_all(&repo_dir)?;
+        fs::remove_dir_all(repo_dir)?;
         let _ = LocalRepositoryManager::new(library_root.path())?;
         Ok(())
     }
@@ -548,7 +548,7 @@ mod test {
             .join(DOWNLOAD_DIRECTORY)
             .join(REPO_ID)
             .join(".git");
-        fs::remove_dir_all(&git_dir)?;
+        fs::remove_dir_all(git_dir)?;
         assert!(LocalRepositoryManager::new(library_root.path()).is_err());
         Ok(())
     }