method to associated constant, clippy lints

Author: Heliozoa

tmc-langs-framework/src/io/submission_processing.rs

@@ -8,7 +8,7 @@ use lazy_static::lazy_static;
 use log::{debug, info};
 use regex::Regex;
 use std::fs::{self, File};
-use std::io::{BufWriter, Write};
+use std::io::Write;
 use std::path::{Path, PathBuf};
 use walkdir::{DirEntry, WalkDir};
 

tmc-langs-framework/src/plugin.rs

@@ -26,11 +26,9 @@ use walkdir::WalkDir;
 /// Implementations must be thread-safe and preferably fully stateless. Users of
 /// this interface are free to cache results if needed.
 pub trait LanguagePlugin {
+    const PLUGIN_NAME: &'static str;
     type StudentFilePolicy: StudentFilePolicy + 'static;
 
-    /// Returns the name of the plug-in.
-    fn get_plugin_name() -> &'static str;
-
     /// Returns a list of all directories inside that contain an exercise in this
     /// language.
     ///
@@ -207,16 +205,13 @@ mod test {
     }
 
     impl LanguagePlugin for MockPlugin {
+        const PLUGIN_NAME: &'static str = "mock_plugin";
         type StudentFilePolicy = MockPolicy;
 
         fn get_student_file_policy(project_path: &Path) -> Self::StudentFilePolicy {
             unimplemented!()
         }
 
-        fn get_plugin_name() -> &'static str {
-            unimplemented!()
-        }
-
         fn scan_exercise(&self, _path: &Path, _exercise_name: String) -> Result<ExerciseDesc> {
             unimplemented!()
         }

tmc-langs-java/src/ant.rs

@@ -15,7 +15,6 @@ use std::time::Duration;
 use tmc_langs_framework::{
     domain::{ExerciseDesc, RunResult},
     plugin::{Language, LanguagePlugin, ValidationResult},
-    policy::StudentFilePolicy,
     Error,
 };
 use walkdir::WalkDir;
@@ -71,12 +70,9 @@ impl AntPlugin {
 }
 
 impl LanguagePlugin for AntPlugin {
+    const PLUGIN_NAME: &'static str = "apache-ant";
     type StudentFilePolicy = AntStudentFilePolicy;
 
-    fn get_plugin_name() -> &'static str {
-        "apache-ant"
-    }
-
     fn check_code_style(&self, path: &Path, locale: Language) -> Option<ValidationResult> {
         self.run_checkstyle(&locale, path)
     }

tmc-langs-java/src/maven.rs

@@ -17,7 +17,6 @@ use tar::Archive;
 use tmc_langs_framework::{
     domain::{ExerciseDesc, RunResult},
     plugin::{Language, LanguagePlugin, ValidationResult},
-    policy::StudentFilePolicy,
     Error,
 };
 
@@ -73,12 +72,9 @@ impl MavenPlugin {
 }
 
 impl LanguagePlugin for MavenPlugin {
+    const PLUGIN_NAME: &'static str = "apache-maven";
     type StudentFilePolicy = MavenStudentFilePolicy;
 
-    fn get_plugin_name() -> &'static str {
-        "apache-maven"
-    }
-
     fn check_code_style(&self, path: &Path, locale: Language) -> Option<ValidationResult> {
         self.run_checkstyle(&locale, path)
     }

tmc-langs-make/src/plugin.rs

@@ -17,7 +17,6 @@ use std::time::Duration;
 use tmc_langs_framework::{
     domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TmcProjectYml},
     plugin::LanguagePlugin,
-    policy::StudentFilePolicy,
     Error,
 };
 
@@ -117,12 +116,9 @@ impl MakePlugin {
 }
 
 impl LanguagePlugin for MakePlugin {
+    const PLUGIN_NAME: &'static str = "make";
     type StudentFilePolicy = MakeStudentFilePolicy;
 
-    fn get_plugin_name() -> &'static str {
-        "make"
-    }
-
     fn scan_exercise(&self, path: &Path, exercise_name: String) -> Result<ExerciseDesc, Error> {
         if !Self::is_exercise_type_correct(path) {
             return MakeError::NoExerciseFound.into();

tmc-langs-notests/src/lib.rs

@@ -27,12 +27,9 @@ impl NoTestsPlugin {
 }
 
 impl LanguagePlugin for NoTestsPlugin {
+    const PLUGIN_NAME: &'static str = "No-Tests";
     type StudentFilePolicy = EverythingIsStudentFilePolicy;
 
-    fn get_plugin_name() -> &'static str {
-        "No-Tests"
-    }
-
     fn scan_exercise(&self, path: &Path, exercise_name: String) -> Result<ExerciseDesc, Error> {
         let test_name = format!("{}Test", exercise_name);
         Ok(ExerciseDesc {

tmc-langs-python3/src/plugin.rs

@@ -13,7 +13,6 @@ use std::time::Duration;
 use tmc_langs_framework::{
     domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TestResult},
     plugin::LanguagePlugin,
-    policy::StudentFilePolicy,
     CommandWithTimeout, Error,
 };
 use walkdir::WalkDir;
@@ -27,12 +26,9 @@ impl Python3Plugin {
 }
 
 impl LanguagePlugin for Python3Plugin {
+    const PLUGIN_NAME: &'static str = "python3";
     type StudentFilePolicy = Python3StudentFilePolicy;
 
-    fn get_plugin_name() -> &'static str {
-        "python3"
-    }
-
     fn get_student_file_policy(project_path: &Path) -> Self::StudentFilePolicy {
         Python3StudentFilePolicy::new(project_path.to_owned())
     }

tmc-langs-r/src/plugin.rs

@@ -7,7 +7,7 @@ use super::RRunResult;
 
 use tmc_langs_framework::{
     domain::{ExerciseDesc, RunResult, TestDesc},
-    Error, LanguagePlugin, StudentFilePolicy,
+    Error, LanguagePlugin,
 };
 
 use std::collections::HashMap;
@@ -25,12 +25,9 @@ impl RPlugin {
 }
 
 impl LanguagePlugin for RPlugin {
+    const PLUGIN_NAME: &'static str = "r";
     type StudentFilePolicy = RStudentFilePolicy;
 
-    fn get_plugin_name() -> &'static str {
-        "r"
-    }
-
     fn scan_exercise(&self, path: &Path, exercise_name: String) -> Result<ExerciseDesc, Error> {
         // run available points command
         let args = if cfg!(windows) {

tmc-langs-util/src/task_executor.rs

@@ -234,23 +234,23 @@ impl Plugin {
 fn get_language_plugin(path: &Path) -> Result<Plugin, Error> {
     if MakePlugin::is_exercise_type_correct(path) {
         let make = MakePlugin::new();
-        info!("Detected project as {}", MakePlugin::get_plugin_name());
+        info!("Detected project as {}", MakePlugin::PLUGIN_NAME);
         Ok(Plugin::Make(make))
     } else if NoTestsPlugin::is_exercise_type_correct(path) {
-        info!("Detected project as {}", NoTestsPlugin::get_plugin_name());
+        info!("Detected project as {}", NoTestsPlugin::PLUGIN_NAME);
         Ok(Plugin::NoTests(NoTestsPlugin::new()))
     } else if Python3Plugin::is_exercise_type_correct(path) {
-        info!("Detected project as {}", Python3Plugin::get_plugin_name());
+        info!("Detected project as {}", Python3Plugin::PLUGIN_NAME);
         Ok(Plugin::Python3(Python3Plugin::new()))
     } else if RPlugin::is_exercise_type_correct(path) {
-        info!("Detected project as {}", RPlugin::get_plugin_name());
+        info!("Detected project as {}", RPlugin::PLUGIN_NAME);
         Ok(Plugin::R(RPlugin::new()))
     } else if MavenPlugin::is_exercise_type_correct(path) {
-        info!("Detected project as {}", MavenPlugin::get_plugin_name());
+        info!("Detected project as {}", MavenPlugin::PLUGIN_NAME);
         Ok(Plugin::Maven(MavenPlugin::new()?))
     } else if AntPlugin::is_exercise_type_correct(path) {
         // TODO: currently, ant needs to be last because any project with src and test are recognized as ant
-        info!("Detected project as {}", AntPlugin::get_plugin_name());
+        info!("Detected project as {}", AntPlugin::PLUGIN_NAME);
         Ok(Plugin::Ant(AntPlugin::new()?))
     } else {
         Err(Error::PluginNotFound(path.to_path_buf()))