remove some isolang dependencies

Author: Heliozoa

tmc-langs-cli/Cargo.toml

@@ -9,7 +9,6 @@ tmc-langs-core = { path = "../tmc-langs-core" }
 tmc-langs-framework = { path = "../tmc-langs-framework" }
 tmc-langs-util = { path = "../tmc-langs-util" }
 clap = "2"
-isolang = "1"
 walkdir = "2"
 serde_json = "1"
 env_logger = "0.7"

tmc-langs-cli/src/main.rs

@@ -1,7 +1,6 @@
 //! CLI client for TMC
 
 use clap::{App, Arg, Error, ErrorKind, SubCommand};
-use isolang::Language;
 use log::debug;
 use serde::Serialize;
 use std::collections::HashMap;
@@ -11,7 +10,7 @@ use std::io::Write;
 use std::path::{Path, PathBuf};
 use tmc_langs_core::{FeedbackAnswer, TmcCore};
 use tmc_langs_framework::io::submission_processing;
-use tmc_langs_util::task_executor;
+use tmc_langs_util::{task_executor, Language};
 use url::Url;
 use walkdir::WalkDir;
 

tmc-langs-core/Cargo.toml

@@ -19,7 +19,6 @@ regex = "1"
 lazy_static = "1"
 percent-encoding = "2"
 serde_json = "1"
-isolang = "1"
 
 [dev-dependencies]
 env_logger = "0.7"

tmc-langs-core/src/lib.rs

@@ -6,12 +6,11 @@ mod response;
 mod tmc_core;
 
 pub use error::CoreError;
-pub use isolang::Language;
 pub use request::FeedbackAnswer;
 pub use response::{
     Course, CourseData, CourseDataExercise, CourseDataExercisePoint, CourseDetails, CourseExercise,
     ExerciseDetails, NewSubmission, Organization, Review, Submission, SubmissionFeedbackResponse,
     User,
 };
 pub use tmc_core::TmcCore;
-pub use tmc_langs_util::{RunResult, ValidationResult};
+pub use tmc_langs_util::{Language, RunResult, ValidationResult};

tmc-langs-core/src/tmc_core/api.rs

@@ -9,7 +9,6 @@ use crate::{
     SubmissionFeedbackResponse, TmcCore, User,
 };
 
-use isolang::Language;
 use oauth2::{prelude::SecretNewType, TokenResponse};
 use reqwest::blocking::{multipart::Form, RequestBuilder, Response as ReqwestResponse};
 use serde::de::DeserializeOwned;
@@ -18,6 +17,7 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::path::Path;
 use std::time::SystemTime;
+use tmc_langs_util::Language;
 use url::Url;
 
 /// Provides a wrapper for reqwest Response's json that deserializes into Response<T> and converts it into a result

tmc-langs-java/Cargo.toml

@@ -6,7 +6,6 @@ edition = "2018"
 
 [dependencies]
 tmc-langs-framework = { path = "../tmc-langs-framework" }
-isolang = "1"
 log = "0.4"
 walkdir = "2"
 thiserror = "1"

tmc-langs-java/src/ant.rs

@@ -4,7 +4,6 @@ pub mod policy;
 
 use super::{error::JavaError, plugin::JavaPlugin, CompileResult, TestRun, SEPARATOR};
 
-use isolang::Language;
 use j4rs::Jvm;
 use policy::AntStudentFilePolicy;
 use std::env;
@@ -15,7 +14,7 @@ use std::process::Command;
 use std::time::Duration;
 use tmc_langs_framework::{
     domain::{ExerciseDesc, RunResult},
-    plugin::{LanguagePlugin, ValidationResult},
+    plugin::{Language, LanguagePlugin, ValidationResult},
     policy::StudentFilePolicy,
     Error,
 };

tmc-langs-java/src/maven.rs

@@ -4,7 +4,6 @@ pub mod policy;
 
 use super::{error::JavaError, plugin::JavaPlugin, CompileResult, TestRun, SEPARATOR};
 
-use isolang::Language;
 use j4rs::Jvm;
 use policy::MavenStudentFilePolicy;
 use std::fs;
@@ -13,7 +12,7 @@ use std::process::Command;
 use std::time::Duration;
 use tmc_langs_framework::{
     domain::{ExerciseDesc, RunResult},
-    plugin::{LanguagePlugin, ValidationResult},
+    plugin::{Language, LanguagePlugin, ValidationResult},
     policy::StudentFilePolicy,
     Error,
 };

tmc-langs-java/src/plugin.rs

@@ -2,7 +2,6 @@
 
 use super::{error::JavaError, CompileResult, TestCase, TestCaseStatus, TestMethod, TestRun};
 
-use isolang::Language;
 use j4rs::{InvocationArg, Jvm};
 use std::collections::HashMap;
 use std::convert::TryFrom;
@@ -11,7 +10,7 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 use tmc_langs_framework::{
     domain::{ExerciseDesc, RunResult, RunStatus, TestDesc, TestResult},
-    plugin::{LanguagePlugin, ValidationResult},
+    plugin::{Language, LanguagePlugin, ValidationResult},
 };
 use walkdir::WalkDir;
 

tmc-langs-python3/Cargo.toml

@@ -6,7 +6,6 @@ edition = "2018"
 
 [dependencies]
 tmc-langs-framework = { path = "../tmc-langs-framework" }
-isolang = "1"
 lazy_static = "1"
 log = "0.4"
 serde = "1"