Clippy, fmt, generate

Author: Heliozoa

Cargo.lock

@@ -18,6 +18,7 @@ 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

@@ -10,7 +10,7 @@ use serde::de::{
 pub fn from_value<'j, C, T>(cx: &mut C, value: Handle<'j, JsValue>) -> LibResult<T>
 where
     C: Context<'j>,
-    T: DeserializeOwned + ?Sized,
+    T: DeserializeOwned,
 {
     let mut deserializer: Deserializer<C> = Deserializer::new(cx, value);
     let t = T::deserialize(&mut deserializer)?;

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

@@ -9,7 +9,7 @@ macro_rules! lock {
     ( $cx: ident, $( $path: expr ),+ ) => {
         $(
             let path_buf: PathBuf = (&$path).into();
-            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 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 _guard = lock.lock().map_err(|e| $crate::helpers::convert_err(&mut $cx, e))?;
         )*
     };

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

@@ -16,7 +16,6 @@ use std::{
 };
 use thiserror::Error;
 use tmc_langs::{
-    file_util,
     tmc::{
         request::FeedbackAnswer,
         response::{NewSubmission, SubmissionFinished},
@@ -25,6 +24,7 @@ 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| convert_err(&mut cx, e))?;
+        .map_err(|e: tmc_langs_util::FileError| 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

@@ -20,20 +20,19 @@ use serde_json::Value;
 use std::{
     collections::HashMap,
     env,
-    fs::File,
     io::{self, BufReader, Cursor, Read},
-    ops::Deref,
     path::{Path, PathBuf},
 };
 use tmc_langs::{
-    file_util::{self, Lock, LockOptions},
-    file_util,
     mooc::MoocClient,
     tmc::{request::FeedbackAnswer, TestMyCodeClient, TestMyCodeClientError},
     CommandError, Compression, Credentials, DownloadOrUpdateCourseExercisesResult, DownloadResult,
     Language, StyleValidationResult, TmcConfig, UpdatedExercise,
 };
-use tmc_langs_util::deserialize;
+use tmc_langs_util::{
+    deserialize,
+    file_util::{self, Lock, LockOptions},
+};
 
 pub enum ParsingResult {
     Ok(Cli),

crates/bindings/tmc-langs-node/ts/generated.d.ts

@@ -95,7 +95,7 @@ impl Lock {
                 FileOrLock::File(file)
             }
         };
-        Ok(Guard { lock, path: &path })
+        Ok(Guard { lock, path })
     }
 }
 

crates/tmc-langs-cli/src/lib.rs

@@ -73,8 +73,8 @@ pub fn migrate_exercise(
         exercise_path.display()
     );
 
-    let mut lock = Lock::dir(exercise_path.to_path_buf(), LockOptions::Write)?;
-    let guard = lock.lock()?;
+    let mut lock = Lock::dir(exercise_path, LockOptions::Write)?;
+    let _guard = lock.lock()?;
     let mut projects_config = ProjectsConfig::load(&tmc_config.projects_dir)?;
     let course_config = projects_config
         .courses

crates/tmc-langs-util/src/file_util/lock_unix.rs

@@ -11,7 +11,6 @@ use tmc_langs_util::{
     file_util::{self, Lock, LockOptions},
     FileError,
 };
-use uuid::Uuid;
 use walkdir::WalkDir;
 
 /// A project directory is a directory which contains directories of courses (which contain a `course_config.toml`).
@@ -32,7 +31,7 @@ impl ProjectsConfig {
         let mut unexpected_entries = Vec::new();
         for entry in WalkDir::new(projects_dir).min_depth(1).max_depth(1) {
             let entry = entry?;
-            let course_config_path = entry.path().join("course_config.toml");
+            let course_config_path = entry.path().join(COURSE_CONFIG_FILE_NAME);
             if course_config_path.exists() {
                 let file_name = entry.file_name();
                 let course_dir_name = file_name.to_str().ok_or_else(|| {
@@ -146,7 +145,7 @@ impl CourseConfig {
         if !course_dir.exists() {
             file_util::create_dir_all(&course_dir)?;
         }
-        let target = course_dir.join("course_config.toml");
+        let target = course_dir.join(COURSE_CONFIG_FILE_NAME);
         let s = toml::to_string_pretty(&self)?;
         file_util::write_to_file(s.as_bytes(), target)?;
         Ok(())