Import fixes

Author: Heliozoa

Cargo.lock

@@ -18,7 +18,6 @@ version = "1.0.0"
 
 [dependencies]
 tmc-langs = { workspace = true, features = ["ts-rs"] }
-tmc-langs-util = { workspace = true }
 
 base64 = "0.22.0"
 env_logger = "0.11.2"

crates/bindings/tmc-langs-node/Cargo.toml

@@ -9,7 +9,7 @@ macro_rules! lock {
     ( $cx: ident, $( $path: expr ),+ ) => {
         $(
             let path_buf: PathBuf = (&$path).into();
-            let mut lock = ::tmc_langs_util::file_util::Lock::file(path_buf, ::tmc_langs_util::file_util::LockOptions::Write).map_err(|e| $crate::helpers::convert_err(&mut $cx, e))?;
+            let mut lock = $crate::file_util::Lock::file(path_buf, $crate::file_util::LockOptions::Write).map_err(|e| $crate::helpers::convert_err(&mut $cx, e))?;
             let _guard = lock.lock().map_err(|e| $crate::helpers::convert_err(&mut $cx, e))?;
         )*
     };

crates/bindings/tmc-langs-node/src/helpers.rs

@@ -16,6 +16,7 @@ use std::{
 };
 use thiserror::Error;
 use tmc_langs::{
+    file_util,
     tmc::{
         request::FeedbackAnswer,
         response::{NewSubmission, SubmissionFinished},
@@ -24,7 +25,6 @@ use tmc_langs::{
     Compression, Credentials, DownloadOrUpdateCourseExercisesResult, LangsError, Language,
     PrepareSubmission, TmcConfig,
 };
-use tmc_langs_util::file_util;
 
 #[derive(Debug, Error)]
 enum NodeError {
@@ -135,7 +135,7 @@ fn extract_project(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let mut archive_lock = file_util::Lock::file(archive_path, file_util::LockOptions::Read)
-        .map_err(|e: tmc_langs_util::FileError| convert_err(&mut cx, e))?;
+        .map_err(|e| convert_err(&mut cx, e))?;
     let mut archive_guard = archive_lock.lock().map_err(|e| convert_err(&mut cx, e))?;
     let mut data = vec![];
     archive_guard

crates/bindings/tmc-langs-node/src/lib.rs

@@ -50,9 +50,8 @@ pub use tmc_langs_framework::{
 use tmc_langs_plugins::{
     CSharpPlugin, MakePlugin, NoTestsPlugin, Plugin, PluginType, Python3Plugin, RPlugin,
 };
-use tmc_langs_util::file_util;
 // the Java plugin is disabled on musl
-pub use tmc_langs_util::{notification_reporter, progress_reporter};
+pub use tmc_langs_util::{file_util, notification_reporter, progress_reporter};
 pub use tmc_mooc_client as mooc;
 pub use tmc_testmycode_client as tmc;
 use toml::Value as TomlValue;