Merge pull request #4619 from wasmerio/wasix-more-errors

feat(wasix): More improvements to spawn error propagation

lib/wasix/src/lib.rs

@@ -155,8 +155,8 @@ pub enum SpawnError {
     #[error("unsupported")]
     Unsupported,
     /// Not found
-    #[error("not found")]
-    NotFound,
+    #[error("not found: {message}")]
+    NotFound { message: String },
     /// Tried to run the specified binary as a new WASI thread/process, but
     /// the binary name was not found.
     #[error("could not find binary '{binary}'")]
@@ -240,7 +240,7 @@ impl SpawnError {
     /// [`NotFound`]: SpawnError::NotFound
     #[must_use]
     pub fn is_not_found(&self) -> bool {
-        matches!(self, Self::NotFound)
+        matches!(self, Self::NotFound { .. } | Self::MissingEntrypoint { .. })
     }
 }
 

lib/wasix/src/os/console/mod.rs

@@ -202,7 +202,9 @@ impl Console {
                         .ok();
                 });
                 tracing::debug!(error=?e, %webc, "failed to get webc dependency");
-                return Err(SpawnError::NotFound);
+                return Err(SpawnError::NotFound {
+                    message: e.to_string(),
+                });
             }
         };
 

lib/wasix/src/syscalls/mod.rs

@@ -1507,8 +1507,8 @@ pub(crate) fn _prepare_wasi(wasi_env: &mut WasiEnv, args: Option<Vec<String>>) {
 pub(crate) fn conv_spawn_err_to_errno(err: &SpawnError) -> Errno {
     match err {
         SpawnError::AccessDenied => Errno::Access,
-        SpawnError::NotFound => Errno::Noent,
         SpawnError::Unsupported => Errno::Noexec,
+        _ if err.is_not_found() => Errno::Noent,
         _ => Errno::Inval,
     }
 }