unified imports

Author: Heliozoa

plugins/csharp/src/lib.rs

@@ -3,8 +3,9 @@
 mod error;
 mod plugin;
 
-pub use error::CSharpError;
-pub use plugin::{CSharpPlugin, CSharpStudentFilePolicy};
+pub use self::error::CSharpError;
+pub use self::plugin::{CSharpPlugin, CSharpStudentFilePolicy};
+
 use serde::Deserialize;
 use tmc_langs_framework::domain::TestResult;
 

plugins/csharp/src/plugin.rs

@@ -2,8 +2,9 @@
 
 mod policy;
 
+pub use self::policy::CSharpStudentFilePolicy;
+
 use crate::{CSTestResult, CSharpError};
-pub use policy::CSharpStudentFilePolicy;
 use std::collections::HashMap;
 use std::env;
 use std::ffi::{OsStr, OsString};

plugins/java/src/ant.rs

@@ -2,9 +2,9 @@
 
 pub mod policy;
 
+use self::policy::AntStudentFilePolicy;
 use crate::{error::JavaError, plugin::JavaPlugin, CompileResult, TestRun, SEPARATOR};
 use j4rs::Jvm;
-use policy::AntStudentFilePolicy;
 use std::env;
 use std::ffi::OsStr;
 use std::path::{Path, PathBuf};

plugins/java/src/lib.rs

@@ -5,9 +5,9 @@ mod error;
 mod maven;
 mod plugin;
 
-pub use ant::{policy::AntStudentFilePolicy, AntPlugin};
-pub use error::JavaError;
-pub use maven::{policy::MavenStudentFilePolicy, MavenPlugin};
+pub use self::ant::{policy::AntStudentFilePolicy, AntPlugin};
+pub use self::error::JavaError;
+pub use self::maven::{policy::MavenStudentFilePolicy, MavenPlugin};
 
 use j4rs::{ClasspathEntry, Jvm, JvmBuilder};
 use serde::Deserialize;

plugins/java/src/maven.rs

@@ -2,10 +2,10 @@
 
 pub mod policy;
 
+use self::policy::MavenStudentFilePolicy;
 use crate::{error::JavaError, plugin::JavaPlugin, CompileResult, TestRun, SEPARATOR};
 use flate2::read::GzDecoder;
 use j4rs::Jvm;
-use policy::MavenStudentFilePolicy;
 use std::ffi::OsString;
 use std::io::Cursor;
 use std::path::{Path, PathBuf};

plugins/notests/src/lib.rs

@@ -1,10 +1,11 @@
 //! Language plugin for no_tests exercises
 
+pub use tmc_langs_framework::policy::EverythingIsStudentFilePolicy as NoTestsStudentFilePolicy;
+
 use std::collections::HashMap;
 use std::io::{Read, Seek};
 use std::path::{Path, PathBuf};
 use std::time::Duration;
-pub use tmc_langs_framework::policy::EverythingIsStudentFilePolicy as NoTestsStudentFilePolicy;
 use tmc_langs_framework::{
     anyhow,
     domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TestResult},

plugins/python3/src/lib.rs

@@ -4,10 +4,11 @@ mod error;
 mod plugin;
 mod policy;
 
-pub use error::PythonError;
+pub use self::error::PythonError;
+pub use self::plugin::Python3Plugin;
+pub use self::policy::Python3StudentFilePolicy;
+
 use lazy_static::lazy_static;
-pub use plugin::Python3Plugin;
-pub use policy::Python3StudentFilePolicy;
 use serde::{Deserialize, Serialize};
 use std::env;
 use std::path::PathBuf;

plugins/r/src/lib.rs

@@ -4,8 +4,9 @@ mod error;
 mod plugin;
 mod policy;
 
-pub use plugin::RPlugin;
-pub use policy::RStudentFilePolicy;
+pub use self::plugin::RPlugin;
+pub use self::policy::RStudentFilePolicy;
+
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use tmc_langs_framework::domain::{RunResult, RunStatus, TestResult};

tmc-langs-cli/src/config.rs

@@ -4,9 +4,9 @@ mod credentials;
 mod projects_config;
 mod tmc_config;
 
-pub use credentials::Credentials;
-pub use projects_config::{CourseConfig, Exercise, ProjectsConfig};
-pub use tmc_config::{ConfigValue, TmcConfig};
+pub use self::credentials::Credentials;
+pub use self::projects_config::{CourseConfig, Exercise, ProjectsConfig};
+pub use self::tmc_config::{ConfigValue, TmcConfig};
 
 use anyhow::{Context, Error};
 use std::env;

tmc-langs-cli/src/main.rs

@@ -5,15 +5,15 @@ mod config;
 mod error;
 mod output;
 
+use self::config::ProjectsConfig;
+use self::config::{CourseConfig, Credentials, Exercise, TmcConfig};
+use self::error::{InvalidTokenError, SandboxTestError};
+use self::output::{
+    CombinedCourseData, ErrorData, Kind, Output, OutputData, OutputResult, Status, Warnings,
+};
 use anyhow::{Context, Result};
 use clap::{ArgMatches, Error, ErrorKind};
-use config::ProjectsConfig;
-use config::{CourseConfig, Credentials, Exercise, TmcConfig};
-use error::{InvalidTokenError, SandboxTestError};
 use heim::disk;
-use output::{
-    CombinedCourseData, ErrorData, Kind, Output, OutputData, OutputResult, Status, Warnings,
-};
 use serde::Serialize;
 use serde_json::Value as JsonValue;
 use std::collections::HashMap;