Clippy

Author: Heliozoa

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

@@ -297,9 +297,7 @@ fn download_model_solution(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client
-            .download_model_solution(exercise_id, &target)
-            .map_err(Box::new)?)
+        Ok(client.download_model_solution(exercise_id, &target)?)
     });
     convert_res(&mut cx, res)
 }
@@ -393,7 +391,7 @@ fn get_course_details(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client.get_course_details(course_id).map_err(Box::new)?)
+        Ok(client.get_course_details(course_id)?)
     });
     convert_res(&mut cx, res)
 }
@@ -407,7 +405,7 @@ fn get_course_exercises(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client.get_course_exercises(course_id).map_err(Box::new)?)
+        Ok(client.get_course_exercises(course_id)?)
     });
     convert_res(&mut cx, res)
 }
@@ -421,7 +419,7 @@ fn get_course_settings(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client.get_course(course_id).map_err(Box::new)?)
+        Ok(client.get_course(course_id)?)
     });
     convert_res(&mut cx, res)
 }
@@ -435,7 +433,7 @@ fn get_courses(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client.list_courses(&organization).map_err(Box::new)?)
+        Ok(client.list_courses(&organization)?)
     });
     convert_res(&mut cx, res)
 }
@@ -449,7 +447,7 @@ fn get_exercise_details(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client.get_exercise_details(exercise_id).map_err(Box::new)?)
+        Ok(client.get_exercise_details(exercise_id)?)
     });
     convert_res(&mut cx, res)
 }
@@ -463,9 +461,7 @@ fn get_exercise_submissions(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client
-            .get_exercise_submissions_for_current_user(exercise_id)
-            .map_err(Box::new)?)
+        Ok(client.get_exercise_submissions_for_current_user(exercise_id)?)
     });
     convert_res(&mut cx, res)
 }
@@ -481,9 +477,7 @@ fn get_exercise_updates(mut cx: FunctionContext) -> JsResult<JsValue> {
 
     let map = exercise.into_iter().collect();
     let res = with_client(client_name, client_version, |client| {
-        Ok(client
-            .get_exercise_updates(course_id, map)
-            .map_err(Box::new)?)
+        Ok(client.get_exercise_updates(course_id, map)?)
     });
     convert_res(&mut cx, res)
 }
@@ -497,7 +491,7 @@ fn get_organization(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client.get_organization(&organization).map_err(Box::new)?)
+        Ok(client.get_organization(&organization)?)
     });
     convert_res(&mut cx, res)
 }
@@ -506,7 +500,7 @@ fn get_organizations(mut cx: FunctionContext) -> JsResult<JsValue> {
     parse_args!(cx, client_name: String, client_version: String);
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client.get_organizations().map_err(Box::new)?)
+        Ok(client.get_organizations()?)
     });
     convert_res(&mut cx, res)
 }
@@ -520,7 +514,7 @@ fn get_unread_reviews(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client.get_unread_reviews(course_id).map_err(Box::new)?)
+        Ok(client.get_unread_reviews(course_id)?)
     });
     convert_res(&mut cx, res)
 }
@@ -599,9 +593,7 @@ fn mark_review_as_read(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client
-            .mark_review_as_read(course_id, review_id)
-            .map_err(Box::new)?)
+        Ok(client.mark_review_as_read(course_id, review_id)?)
     });
     convert_res(&mut cx, res)
 }
@@ -620,9 +612,7 @@ fn paste(mut cx: FunctionContext) -> JsResult<JsValue> {
 
     let locale = locale.map(|l| Language::from_639_3(&l).expect("Invalid locale"));
     let res = with_client(client_name, client_version, |client| {
-        Ok(client
-            .paste(exercise_id, &submission_path, paste_message, locale)
-            .map_err(Box::new)?)
+        Ok(client.paste(exercise_id, &submission_path, paste_message, locale)?)
     });
     convert_res(&mut cx, res)
 }
@@ -641,14 +631,12 @@ fn request_code_review(mut cx: FunctionContext) -> JsResult<JsValue> {
 
     let locale = Language::from_639_3(&locale).expect("Invalid locale");
     let res = with_client(client_name, client_version, |client| {
-        Ok(client
-            .request_code_review(
-                exercise_id,
-                &submission_path,
-                message_for_reviewer,
-                Some(locale),
-            )
-            .map_err(Box::new)?)
+        Ok(client.request_code_review(
+            exercise_id,
+            &submission_path,
+            message_for_reviewer,
+            Some(locale),
+        )?)
     });
     convert_res(&mut cx, res)
 }
@@ -666,9 +654,7 @@ fn reset_exercise(mut cx: FunctionContext) -> JsResult<JsValue> {
 
     let res = with_client(client_name, client_version, |client| {
         if save_old_state {
-            client
-                .submit(exercise_id, &exercise_path, None)
-                .map_err(Box::new)?;
+            client.submit(exercise_id, &exercise_path, None)?;
         }
         tmc_langs::reset(client, exercise_id, &exercise_path)
     });
@@ -692,9 +678,7 @@ fn send_feedback(mut cx: FunctionContext) -> JsResult<JsValue> {
         })
         .collect();
     let res = with_client(client_name, client_version, |client| {
-        Ok(client
-            .send_feedback(submission_id, feedback)
-            .map_err(Box::new)?)
+        Ok(client.send_feedback(submission_id, feedback)?)
     });
     convert_res(&mut cx, res)
 }
@@ -717,19 +701,15 @@ fn submit(mut cx: FunctionContext) -> JsResult<JsValue> {
 
     let locale = locale.map(|l| Language::from_639_3(&l).expect("Invalid locale"));
     let temp = with_client(client_name, client_version, |client| {
-        let new_submission = client
-            .submit(exercise_id, &submission_path, locale)
-            .map_err(Box::new)?;
+        let new_submission = client.submit(exercise_id, &submission_path, locale)?;
         if dont_block {
             Ok(Temp::NewSubmission(new_submission))
         } else {
             let submission_url = new_submission
                 .submission_url
                 .parse()
                 .expect("Failed to parse submission URL");
-            let finished = client
-                .wait_for_submission_at(submission_url)
-                .map_err(Box::new)?;
+            let finished = client.wait_for_submission_at(submission_url)?;
             Ok(Temp::Finished(Box::new(finished)))
         }
     })
@@ -760,9 +740,7 @@ fn wait_for_submission(mut cx: FunctionContext) -> JsResult<JsValue> {
     );
 
     let res = with_client(client_name, client_version, |client| {
-        Ok(client
-            .wait_for_submission(submission_id)
-            .map_err(Box::new)?)
+        Ok(client.wait_for_submission(submission_id)?)
     });
     convert_res(&mut cx, res)
 }

crates/tmc-langs/src/lib.rs

@@ -120,8 +120,7 @@ pub fn check_exercise_updates(
     if !local_exercises.is_empty() {
         let exercise_ids = local_exercises.iter().map(|e| e.id).collect::<Vec<_>>();
         let server_exercises = client
-            .get_exercises_details(&exercise_ids)
-            .map_err(Box::new)?
+            .get_exercises_details(&exercise_ids)?
             .into_iter()
             .map(|e| (e.id, e))
             .collect::<HashMap<_, _>>();
@@ -152,9 +151,7 @@ pub fn download_old_submission(
 
     if save_old_state {
         // submit old exercise
-        client
-            .submit(exercise_id, output_path, None)
-            .map_err(Box::new)?;
+        client.submit(exercise_id, output_path, None)?;
         log::debug!("finished submission");
     }
 
@@ -164,9 +161,7 @@ pub fn download_old_submission(
 
     // dl submission
     let mut buf = vec![];
-    client
-        .download_old_submission(submission_id, &mut buf)
-        .map_err(Box::new)?;
+    client.download_old_submission(submission_id, &mut buf)?;
     log::debug!("downloaded old submission");
 
     // extract submission
@@ -193,7 +188,6 @@ pub fn submit_exercise(
 
     client
         .submit(exercise.id, exercise_path.as_path(), locale)
-        .map_err(Box::new)
         .map_err(Into::into)
 }
 
@@ -216,7 +210,6 @@ pub fn paste_exercise(
 
     client
         .paste(exercise.id, exercise_path.as_path(), paste_message, locale)
-        .map_err(Box::new)
         .map_err(Into::into)
 }
 
@@ -239,7 +232,7 @@ pub fn download_or_update_course_exercises(
 
     client.require_authentication().map_err(Box::new)?;
 
-    let exercises_details = client.get_exercises_details(exercises).map_err(Box::new)?;
+    let exercises_details = client.get_exercises_details(exercises)?;
     let projects_config = ProjectsConfig::load(projects_dir)?;
 
     // separate exercises into downloads and skipped
@@ -279,8 +272,7 @@ pub fn download_or_update_course_exercises(
             // not on disk, if flag isn't set check if there are any previous submissions and take the latest one if so
             if !download_template {
                 if let Some(latest_submission) = client
-                    .get_exercise_submissions_for_current_user(exercise_detail.id)
-                    .map_err(Box::new)?
+                    .get_exercise_submissions_for_current_user(exercise_detail.id)?
                     .into_iter()
                     .max_by_key(|s| s.created_at)
                 {
@@ -371,9 +363,7 @@ pub fn download_or_update_course_exercises(
                     match &download_target.kind {
                         DownloadTargetKind::Template => {
                             let mut buf = vec![];
-                            client
-                                .download_exercise(download_target.target.id, &mut buf)
-                                .map_err(Box::new)?;
+                            client.download_exercise(download_target.target.id, &mut buf)?;
                             extract_project(
                                 Cursor::new(buf),
                                 &download_target.target.path,
@@ -384,9 +374,7 @@ pub fn download_or_update_course_exercises(
                         }
                         DownloadTargetKind::Submission { submission_id } => {
                             let mut buf = vec![];
-                            client
-                                .download_exercise(download_target.target.id, &mut buf)
-                                .map_err(Box::new)?;
+                            client.download_exercise(download_target.target.id, &mut buf)?;
                             extract_project(
                                 Cursor::new(buf),
                                 &download_target.target.path,
@@ -409,9 +397,7 @@ pub fn download_or_update_course_exercises(
                             }
 
                             let mut buf = vec![];
-                            client
-                                .download_old_submission(*submission_id, &mut buf)
-                                .map_err(Box::new)?;
+                            client.download_old_submission(*submission_id, &mut buf)?;
                             if let Err(err) = plugin.extract_student_files(
                                 Cursor::new(buf),
                                 Compression::Zip,
@@ -539,9 +525,9 @@ pub fn get_course_data(
 ) -> Result<CombinedCourseData, LangsError> {
     log::debug!("getting course data for {course_id}");
 
-    let details = client.get_course_details(course_id).map_err(Box::new)?;
-    let exercises = client.get_course_exercises(course_id).map_err(Box::new)?;
-    let settings = client.get_course(course_id).map_err(Box::new)?;
+    let details = client.get_course_details(course_id)?;
+    let exercises = client.get_course_exercises(course_id)?;
+    let settings = client.get_course(course_id)?;
     Ok(CombinedCourseData {
         details,
         exercises,
@@ -571,9 +557,7 @@ pub fn login_with_password(
     password: String,
 ) -> Result<tmc::Token, LangsError> {
     log::debug!("logging in with password");
-    let token = client
-        .authenticate(client_name, email, password)
-        .map_err(Box::new)?;
+    let token = client.authenticate(client_name, email, password)?;
     Ok(token)
 }
 
@@ -588,8 +572,7 @@ pub fn init_testmycode_client_with_credentials(
         root_url,
         client_name.to_string(),
         client_version.to_string(),
-    )
-    .map_err(Box::new)?;
+    )?;
 
     // set token from the credentials file if one exists
     let credentials = Credentials::load(client_name)?;
@@ -640,8 +623,7 @@ pub fn update_tmc_exercises(
     if !exercises.is_empty() {
         let tmc_exercise_ids = exercises.iter().map(|e| e.id).collect::<Vec<_>>();
         let mut tmc_server_exercises = client
-            .get_exercises_details(&tmc_exercise_ids)
-            .map_err(Box::new)?
+            .get_exercises_details(&tmc_exercise_ids)?
             .into_iter()
             .map(|e| (e.id, e))
             .collect::<HashMap<_, _>>();
@@ -681,9 +663,7 @@ pub fn update_tmc_exercises(
         if !exercises_to_update.is_empty() {
             for exercise in &exercises_to_update {
                 let mut buf = vec![];
-                client
-                    .download_exercise(exercise.id, &mut buf)
-                    .map_err(Box::new)?;
+                client.download_exercise(exercise.id, &mut buf)?;
                 extract_project(
                     Cursor::new(buf),
                     &exercise.path,
@@ -741,19 +721,15 @@ pub fn update_mooc_exercises(
                 checksum: &e.checksum,
             })
             .collect::<Vec<_>>();
-        let exercise_updates = client
-            .check_exercise_updates(&exercise_update_data)
-            .map_err(Box::new)?;
+        let exercise_updates = client.check_exercise_updates(&exercise_update_data)?;
         for updated_exercise in exercise_updates.updated_exercises {
             if let Some((course, exercise)) = exercises.get(&updated_exercise) {
                 let target = ProjectsConfig::get_mooc_exercise_download_target(
                     projects_dir,
                     &course.directory,
                     &exercise.directory,
                 );
-                let data = client
-                    .download_exercise(updated_exercise)
-                    .map_err(Box::new)?;
+                let data = client.download_exercise(updated_exercise)?;
                 extract_project(Cursor::new(data), &target, Compression::Zip, false, false)?;
                 downloaded.push(MoocExerciseDownload {
                     id: updated_exercise,
@@ -923,9 +899,7 @@ pub fn reset(
         file_util::remove_dir_all(exercise_path)?;
     }
     let mut buf = vec![];
-    client
-        .download_exercise(exercise_id, &mut buf)
-        .map_err(Box::new)?;
+    client.download_exercise(exercise_id, &mut buf)?;
     extract_project(
         Cursor::new(buf),
         exercise_path,

crates/tmc-mooc-client/src/error.rs

@@ -4,7 +4,7 @@ use reqwest::{Method, StatusCode, Url};
 use std::error::Error;
 use thiserror::Error;
 
-pub type MoocClientResult<T> = Result<T, MoocClientError>;
+pub type MoocClientResult<T> = Result<T, Box<MoocClientError>>;
 
 #[derive(Debug, Error)]
 pub enum MoocClientError {