Inline the IOException conversion at each I/O call site

Author: dlunch

java_runtime/src/classes/java/io.rs

@@ -34,10 +34,3 @@ pub use self::{
     output_stream::OutputStream, print_stream::PrintStream, print_writer::PrintWriter, random_access_file::RandomAccessFile, reader::Reader,
     serializable::Serializable, string_writer::StringWriter, writer::Writer,
 };
-
-pub(crate) async fn checked<T>(jvm: &jvm::Jvm, result: crate::IOResult<T>) -> jvm::Result<T> {
-    match result {
-        Ok(x) => Ok(x),
-        Err(_) => Err(jvm.exception("java/io/IOException", "I/O error").await),
-    }
-}

java_runtime/src/classes/java/io/file_input_stream.rs

@@ -79,8 +79,12 @@ impl FileInputStream {
         let rust_file = FileDescriptor::file(jvm, context, fd).await?;
 
         // TODO get os buffer size
-        let stat = super::checked(jvm, rust_file.metadata().await).await?;
-        let tell = super::checked(jvm, rust_file.tell().await).await?;
+        let Ok(stat) = rust_file.metadata().await else {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        };
+        let Ok(tell) = rust_file.tell().await else {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        };
 
         let available = stat.size - tell;
 
@@ -101,7 +105,9 @@ impl FileInputStream {
         let mut rust_file = FileDescriptor::file(jvm, context, fd).await?;
 
         let mut rust_buf = vec![0; length as _];
-        let read = super::checked(jvm, rust_file.read(&mut rust_buf).await).await?;
+        let Ok(read) = rust_file.read(&mut rust_buf).await else {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        };
         if read == 0 {
             return Ok(-1);
         }
@@ -118,7 +124,9 @@ impl FileInputStream {
         let mut rust_file = FileDescriptor::file(jvm, context, fd).await?;
 
         let mut buf = [0; 1];
-        let read = super::checked(jvm, rust_file.read(&mut buf).await).await?;
+        let Ok(read) = rust_file.read(&mut buf).await else {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        };
         if read == 0 {
             return Ok(-1);
         }

java_runtime/src/classes/java/io/file_output_stream.rs

@@ -87,7 +87,9 @@ impl FileOutputStream {
         let mut buf = vec![0; length as _];
         jvm.array_raw_buffer(&buffer).await?.read(offset as _, &mut buf)?;
 
-        super::checked(jvm, file.write(cast_slice(&buf)).await).await?;
+        if file.write(cast_slice(&buf)).await.is_err() {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        }
 
         Ok(())
     }
@@ -98,7 +100,9 @@ impl FileOutputStream {
         let fd = jvm.get_field(&this, "fd", "Ljava/io/FileDescriptor;").await?;
         let mut file = FileDescriptor::file(jvm, context, fd).await?;
 
-        super::checked(jvm, file.write(&[byte as u8]).await).await?;
+        if file.write(&[byte as u8]).await.is_err() {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        }
 
         Ok(())
     }

java_runtime/src/classes/java/io/random_access_file.rs

@@ -114,7 +114,9 @@ impl RandomAccessFile {
         let mut rust_file = FileDescriptor::file(jvm, context, fd).await?;
 
         let mut rust_buf = vec![0; length as usize];
-        let read = super::checked(jvm, rust_file.read(&mut rust_buf).await).await?;
+        let Ok(read) = rust_file.read(&mut rust_buf).await else {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        };
 
         jvm.array_raw_buffer_mut(&mut buf).await?.write(offset as _, &rust_buf)?;
 
@@ -145,7 +147,9 @@ impl RandomAccessFile {
 
         let mut rust_buf = vec![0; length as usize];
         jvm.array_raw_buffer(&buf).await?.read(offset as _, &mut rust_buf)?;
-        super::checked(jvm, rust_file.write(&cast_vec(rust_buf)).await).await?;
+        if rust_file.write(&cast_vec(rust_buf)).await.is_err() {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        }
 
         Ok(())
     }
@@ -156,7 +160,9 @@ impl RandomAccessFile {
         let fd = jvm.get_field(&this, "fd", "Ljava/io/FileDescriptor;").await?;
         let mut rust_file = FileDescriptor::file(jvm, context, fd).await?;
 
-        super::checked(jvm, rust_file.seek(pos as _).await).await?;
+        if rust_file.seek(pos as _).await.is_err() {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        }
 
         Ok(())
     }
@@ -167,7 +173,9 @@ impl RandomAccessFile {
         let fd = jvm.get_field(&this, "fd", "Ljava/io/FileDescriptor;").await?;
         let mut rust_file = FileDescriptor::file(jvm, context, fd).await?;
 
-        super::checked(jvm, rust_file.set_len(new_length as _).await).await?;
+        if rust_file.set_len(new_length as _).await.is_err() {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        }
 
         Ok(())
     }
@@ -178,7 +186,10 @@ impl RandomAccessFile {
         let fd = jvm.get_field(&this, "fd", "Ljava/io/FileDescriptor;").await?;
         let rust_file = FileDescriptor::file(jvm, context, fd).await?;
 
-        let len = super::checked(jvm, rust_file.metadata().await).await?.size;
+        let Ok(metadata) = rust_file.metadata().await else {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        };
+        let len = metadata.size;
 
         Ok(len as i64)
     }
@@ -189,7 +200,9 @@ impl RandomAccessFile {
         let fd = jvm.get_field(&this, "fd", "Ljava/io/FileDescriptor;").await?;
         let rust_file = FileDescriptor::file(jvm, context, fd).await?;
 
-        let pos = super::checked(jvm, rust_file.tell().await).await?;
+        let Ok(pos) = rust_file.tell().await else {
+            return Err(jvm.exception("java/io/IOException", "I/O error").await);
+        };
 
         Ok(pos as i64)
     }