Replaced boxed errors with anyhow::Error

Changelog: Changed

Cargo.toml

@@ -19,6 +19,7 @@ serialport = "4.2.2"
 test-case = "3.3.1"
 tar = "0.4.40"
 thiserror = "1.0.62"
+anyhow = { version = "1.0.86", features = ["backtrace"] }
 
 [dependencies.filevec]
 path = "lib/filevec"

src/command/common.rs

@@ -1,5 +1,6 @@
 use super::{CommandError, CommandResult, SyncExecutionContext};
 use crate::communication::{CEPPacket, CommunicationHandle};
+use anyhow::anyhow;
 use std::time::Duration;
 
 pub fn check_length(
@@ -12,9 +13,9 @@ pub fn check_length(
         Ok(())
     } else {
         com.send_packet(&CEPPacket::Nack)?;
-        Err(CommandError::ProtocolViolation(
-            format!("Received command with {actual_len} bytes, expected {n}").into(),
-        ))
+        Err(CommandError::ProtocolViolation(anyhow!(
+            "Received command with {actual_len} bytes, expected {n}"
+        )))
     }
 }
 
@@ -48,10 +49,10 @@ pub fn terminate_student_program(exec: &mut SyncExecutionContext) -> CommandResu
                 .take()
                 .unwrap()
                 .join()
-                .or(Err(CommandError::NonRecoverable("Supervisor thread panicked".into())))?;
+                .or(Err(CommandError::NonRecoverable(anyhow!("Supervisor thread panicked"))))?;
             return Ok(());
         }
     }
 
-    Err(CommandError::NonRecoverable("Supervisor thread did not finish in time".into()))
+    Err(CommandError::NonRecoverable(anyhow!("Supervisor thread did not finish in time")))
 }

src/command/error.rs

@@ -1,15 +1,13 @@
 use crate::communication::CommunicationError;
 
-type BoxedError = Box<dyn std::error::Error>;
-
 #[derive(Debug, thiserror::Error)]
 pub enum CommandError {
-    #[error("Non-recoverable: {0}")]
-    NonRecoverable(BoxedError),
-    #[error("External: {0}")]
-    External(BoxedError),
-    #[error("Protocol Violation: {0}")]
-    ProtocolViolation(BoxedError),
+    #[error("Non-recoverable: {0:?}")]
+    NonRecoverable(anyhow::Error),
+    #[error("External: {0:?}")]
+    External(anyhow::Error),
+    #[error("Protocol Violation: {0:?}")]
+    ProtocolViolation(anyhow::Error),
 }
 
 impl From<std::io::Error> for CommandError {

src/command/execute_program.rs

@@ -6,6 +6,7 @@ use crate::{
     },
     communication::{CEPPacket, CommunicationHandle},
 };
+use anyhow::anyhow;
 use std::{
     io::ErrorKind,
     path::{Path, PathBuf},
@@ -73,7 +74,7 @@ pub fn execute_program(
 fn create_student_process(program_id: u16, timestamp: u32) -> Result<Popen, CommandError> {
     let program_path = format!("./archives/{program_id}/main.py");
     if !Path::new(&program_path).exists() {
-        return Err(CommandError::ProtocolViolation("Could not find matching program".into()));
+        return Err(CommandError::ProtocolViolation(anyhow!("Could not find matching program")));
     }
 
     // TODO run the program from a student user (setuid)

src/command/mod.rs

@@ -9,6 +9,7 @@ mod store_archive;
 mod update_time;
 
 use crate::communication::{CEPPacket, CommunicationHandle};
+use anyhow::anyhow;
 pub use common::*;
 pub use error::CommandError;
 use execute_program::execute_program;
@@ -50,13 +51,13 @@ pub fn process_command(
 ) -> CommandResult {
     let packet = com.receive_packet()?;
     let CEPPacket::Data(data) = packet else {
-        return Err(CommandError::NonRecoverable(
-            format!("Received {packet:?} as command start, expected Data").into(),
-        ));
+        return Err(CommandError::NonRecoverable(anyhow!(
+            "Received {packet:?} as command start, expected Data"
+        )));
     };
 
     if data.is_empty() {
-        return Err(CommandError::ProtocolViolation("No data sent with data packet".into()));
+        return Err(CommandError::ProtocolViolation(anyhow!("Received empty data packet")));
     }
 
     match data.first().unwrap() {
@@ -67,7 +68,7 @@ pub fn process_command(
         0x05 => return_result(&data, com, exec)?,
         0x06 => update_time(&data, com, exec)?,
         b => {
-            return Err(CommandError::ProtocolViolation(format!("Unknown command {b:#x}").into()));
+            return Err(CommandError::ProtocolViolation(anyhow!("Unknown command {b:#x}")));
         }
     };
 

src/command/return_result.rs

@@ -3,6 +3,7 @@ use crate::{
     command::{check_length, CommandError, Event, ResultId, COMMAND_TIMEOUT},
     communication::{CEPPacket, CommunicationHandle},
 };
+use anyhow::anyhow;
 
 /// Handles a complete return result command. The result tar file is only deleted if a final Ack is
 /// received.
@@ -19,9 +20,9 @@ pub fn return_result(
 
     if !std::path::Path::new(&result_path).exists() {
         com.send_packet(&CEPPacket::Nack)?;
-        return Err(CommandError::ProtocolViolation(
-            format!("Result {program_id}:{timestamp} does not exist").into(),
-        ));
+        return Err(CommandError::ProtocolViolation(anyhow!(
+            "Result {program_id}:{timestamp} does not exist"
+        )));
     }
 
     let bytes = std::fs::read(result_path)?;

src/command/store_archive.rs

@@ -3,6 +3,7 @@ use crate::{
     command::check_length,
     communication::{CEPPacket, CommunicationHandle},
 };
+use anyhow::anyhow;
 use std::{io::Write, process::Command};
 
 /// This function implements the Store Archive command, including the reception of the archive itself
@@ -49,7 +50,7 @@ fn unpack_archive(folder: &str, bytes: &[u8]) -> CommandResult {
     match exit_status {
         Ok(status) => {
             if !status.success() {
-                return Err(CommandError::NonRecoverable("unzip failed".into()));
+                return Err(CommandError::NonRecoverable(anyhow!("unzip failed")));
             }
         }
         Err(err) => {

src/command/update_time.rs

@@ -1,5 +1,6 @@
 use super::{check_length, CommandError, CommandResult, SyncExecutionContext};
 use crate::communication::{CEPPacket, CommunicationHandle};
+use anyhow::anyhow;
 use std::process::Command;
 
 /// Handles the update time command
@@ -20,7 +21,7 @@ pub fn update_time(
 fn set_system_time(s_since_epoch: i32) -> CommandResult {
     let exit_status = Command::new("date").arg("-s").arg(format!("@{s_since_epoch}")).status()?;
     if !exit_status.success() {
-        return Err(CommandError::NonRecoverable("date utility failed".into()));
+        return Err(CommandError::NonRecoverable(anyhow!("date utility failed")));
     }
 
     Ok(())

src/communication/mod.rs

@@ -173,7 +173,6 @@ impl From<CEPParseError> for CommunicationError {
     }
 }
 
-
 #[allow(clippy::needless_pass_by_value)]
 #[cfg(test)]
 mod tests {