imports formatting and serde_path_to_error

Author: Heliozoa

Cargo.lock

@@ -1,14 +1,10 @@
-//!
 //! Deserialize a `JsValue` into a Rust data structure
-//!
 
-use crate::error::Error as LibError;
-use crate::error::Result as LibResult;
-use neon::prelude::*;
-use neon::types::buffer::TypedArray;
-use serde::de::Visitor;
+use crate::error::{Error as LibError, Result as LibResult};
+use neon::{prelude::*, types::buffer::TypedArray};
 use serde::de::{
     DeserializeOwned, DeserializeSeed, EnumAccess, MapAccess, SeqAccess, Unexpected, VariantAccess,
+    Visitor,
 };
 
 pub fn from_value<'j, C, T>(cx: &mut C, value: Handle<'j, JsValue>) -> LibResult<T>

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

@@ -1,6 +1,5 @@
 use serde::{de, ser};
-use std::convert::From;
-use std::fmt::Display;
+use std::{convert::From, fmt::Display};
 
 pub type Result<T> = std::result::Result<T, Error>;
 

bindings/tmc-langs-node/src/error.rs

@@ -918,9 +918,8 @@ ts_rs::export! {
 
 #[cfg(test)]
 mod test {
-    use std::{env, process::Command};
-
     use once_cell::sync::OnceCell;
+    use std::{env, process::Command};
     use tmc_server_mock::mockito::{server_address, Mock};
 
     static MOCKS: OnceCell<Vec<Mock>> = OnceCell::new();

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

@@ -2,10 +2,8 @@
 //! Serialize a Rust data structure into a `JsValue`
 //!
 
-use crate::error::Error;
-use crate::error::Result as LibResult;
-use neon::prelude::*;
-use neon::types::buffer::TypedArray;
+use crate::error::{Error, Result as LibResult};
+use neon::{prelude::*, types::buffer::TypedArray};
 use serde::ser::{self, Serialize};
 use std::marker::PhantomData;
 

bindings/tmc-langs-node/src/ser.rs

@@ -134,7 +134,7 @@ export interface Exercise {
   all_review_points_given: boolean;
   memory_limit: number | null;
   runtime_params: Array<string>;
-  valgrind_strategy: string;
+  valgrind_strategy: string | null;
   code_review_requests_enabled: boolean;
   run_tests_locally_action_enabled: boolean;
   latest_submission_url: string | null;

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

@@ -33,6 +33,7 @@ impl CSTestResult {
 #[allow(clippy::unwrap_used)]
 mod test {
     use super::*;
+    use tmc_langs_util::deserialize;
 
     #[test]
     fn deserializes() {
@@ -46,6 +47,6 @@ mod test {
 }
 "#;
 
-        let _cstr: CSTestResult = serde_json::from_str(s).unwrap();
+        let _cstr: CSTestResult = deserialize::json_from_str(s).unwrap();
     }
 }

plugins/csharp/src/cs_test_result.rs

@@ -3,15 +3,15 @@
 use std::path::PathBuf;
 use thiserror::Error;
 use tmc_langs_framework::TmcError;
-use tmc_langs_util::FileError;
+use tmc_langs_util::{FileError, JsonError};
 
 #[derive(Debug, Error)]
 pub enum CSharpError {
     // Original error types.
     #[error("Failed to parse exercise description at {0}")]
-    ParseExerciseDesc(PathBuf, #[source] serde_json::Error),
+    ParseExerciseDesc(PathBuf, #[source] JsonError),
     #[error("Failed to parse test results at {0}")]
-    ParseTestResults(PathBuf, #[source] serde_json::Error),
+    ParseTestResults(PathBuf, #[source] JsonError),
     #[error("Could not locate cache directory")]
     CacheDir,
     #[error("Could not locate boostrap DLL at {0}")]

plugins/csharp/src/error.rs

@@ -7,6 +7,4 @@ mod error;
 mod plugin;
 mod policy;
 
-pub use self::error::CSharpError;
-pub use self::plugin::CSharpPlugin;
-pub use self::policy::CSharpStudentFilePolicy;
+pub use self::{error::CSharpError, plugin::CSharpPlugin, policy::CSharpStudentFilePolicy};

plugins/csharp/src/lib.rs

@@ -1,19 +1,20 @@
 //! An implementation of LanguagePlugin for C#.
 
-use crate::policy::CSharpStudentFilePolicy;
-use crate::{cs_test_result::CSTestResult, CSharpError};
-use std::collections::{HashMap, HashSet};
-use std::env;
-use std::ffi::{OsStr, OsString};
-use std::io::{BufReader, Cursor, Read, Seek};
-use std::path::{Path, PathBuf};
-use std::time::Duration;
+use crate::{cs_test_result::CSTestResult, policy::CSharpStudentFilePolicy, CSharpError};
+use std::{
+    collections::{HashMap, HashSet},
+    env,
+    ffi::{OsStr, OsString},
+    io::{BufReader, Cursor, Read, Seek},
+    path::{Path, PathBuf},
+    time::Duration,
+};
 use tmc_langs_framework::{
     nom::{bytes, character, combinator, error::VerboseError, sequence, IResult},
     CommandError, ExerciseDesc, Language, LanguagePlugin, RunResult, RunStatus,
     StyleValidationResult, StyleValidationStrategy, TestDesc, TestResult, TmcCommand, TmcError,
 };
-use tmc_langs_util::{file_util, parse_util, FileError};
+use tmc_langs_util::{deserialize, file_util, parse_util, FileError};
 use walkdir::WalkDir;
 use zip::ZipArchive;
 
@@ -108,7 +109,7 @@ impl CSharpPlugin {
     ) -> Result<(RunStatus, Vec<TestResult>), CSharpError> {
         log::debug!("parsing C# test results");
         let test_results = file_util::open_file(test_results_path)?;
-        let test_results: Vec<CSTestResult> = serde_json::from_reader(test_results)
+        let test_results: Vec<CSTestResult> = deserialize::json_from_reader(test_results)
             .map_err(|e| CSharpError::ParseTestResults(test_results_path.to_path_buf(), e))?;
 
         let mut status = RunStatus::Passed;
@@ -194,7 +195,7 @@ impl LanguagePlugin for CSharpPlugin {
         // parse result file
         let exercise_desc_json = file_util::open_file(&exercise_desc_json_path)?;
         let json: HashMap<String, Vec<String>> =
-            serde_json::from_reader(BufReader::new(exercise_desc_json))
+            deserialize::json_from_reader(BufReader::new(exercise_desc_json))
                 .map_err(|e| CSharpError::ParseExerciseDesc(exercise_desc_json_path, e))?;
 
         let mut tests = vec![];