Remove JavaError::FatalError

Author: dlunch

jvm/src/error.rs

@@ -1,22 +1,19 @@
 use alloc::{
     boxed::Box,
     fmt::{self, Display, Formatter},
-    string::String,
 };
 
 use crate::ClassInstance;
 
 #[derive(Debug)]
 pub enum JavaError {
     JavaException(Box<dyn ClassInstance>),
-    FatalError(String),
 }
 
 impl Display for JavaError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
             JavaError::JavaException(e) => write!(f, "Java exception: {e:?}"),
-            JavaError::FatalError(e) => write!(f, "Fatal error: {e}"),
         }
     }
 }

jvm_rust/src/interpreter.rs

@@ -58,7 +58,6 @@ impl Interpreter {
                         return Err(JavaError::JavaException(e));
                     }
                 }
-                Err(e) => return Err(e),
             }
         }
 
@@ -680,7 +679,9 @@ impl Interpreter {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
                 let value1: i32 = stack_frame.operand_stack.pop().unwrap().into();
 
-                stack_frame.operand_stack.push(JavaValue::Int(((value1 as u32) >> ((value2 as u32) & 0x1f)) as _));
+                stack_frame
+                    .operand_stack
+                    .push(JavaValue::Int(((value1 as u32) >> ((value2 as u32) & 0x1f)) as _));
             }
             Opcode::Ixor => {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
@@ -786,7 +787,9 @@ impl Interpreter {
                 let value2: i32 = stack_frame.operand_stack.pop().unwrap().into();
                 let value1: i64 = stack_frame.operand_stack.pop().unwrap().into();
 
-                stack_frame.operand_stack.push(JavaValue::Long(((value1 as u64) >> ((value2 as u64) & 0x3f)) as _));
+                stack_frame
+                    .operand_stack
+                    .push(JavaValue::Long(((value1 as u64) >> ((value2 as u64) & 0x3f)) as _));
             }
             Opcode::Lxor => {
                 let value2: i64 = stack_frame.operand_stack.pop().unwrap().into();

src/lib.rs

@@ -23,26 +23,24 @@ where
 
     let result = invoke_entrypoint(&jvm, &start_type, args).await;
 
-    if let Err(x) = result {
-        Err(match x {
-            JavaError::JavaException(x) => {
-                let string_writer = jvm.new_class("java/io/StringWriter", "()V", ()).await.unwrap();
-                let print_writer = jvm
-                    .new_class("java/io/PrintWriter", "(Ljava/io/Writer;)V", (string_writer.clone(),))
-                    .await
-                    .unwrap();
-
-                let _: () = jvm
-                    .invoke_virtual(&x, "printStackTrace", "(Ljava/io/PrintWriter;)V", (print_writer,))
-                    .await
-                    .unwrap();
-
-                let trace = jvm.invoke_virtual(&string_writer, "toString", "()Ljava/lang/String;", []).await.unwrap();
-
-                anyhow::anyhow!("Java Exception:\n{}", JavaLangString::to_rust_string(&jvm, &trace).await.unwrap())
-            }
-            JavaError::FatalError(x) => anyhow::anyhow!("Fatal error: {x}"),
-        })
+    if let Err(JavaError::JavaException(x)) = result {
+        let string_writer = jvm.new_class("java/io/StringWriter", "()V", ()).await.unwrap();
+        let print_writer = jvm
+            .new_class("java/io/PrintWriter", "(Ljava/io/Writer;)V", (string_writer.clone(),))
+            .await
+            .unwrap();
+
+        let _: () = jvm
+            .invoke_virtual(&x, "printStackTrace", "(Ljava/io/PrintWriter;)V", (print_writer,))
+            .await
+            .unwrap();
+
+        let trace = jvm.invoke_virtual(&string_writer, "toString", "()Ljava/lang/String;", []).await.unwrap();
+
+        Err(anyhow::anyhow!(
+            "Java Exception:\n{}",
+            JavaLangString::to_rust_string(&jvm, &trace).await.unwrap()
+        ))
     } else {
         Ok(result?)
     }