Merge pull request #3906 from wasmerio/wasix-superset

WASIX updates after superset changes
wasmerio · May 24, 2023 · e62efef · e62efef
2 parents c6138c2 + 49e1556
commit e62efef
Show file tree

Hide file tree

Showing 42 changed files with 468 additions and 1,203 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/cli/src/commands/run.rs b/lib/cli/src/commands/run.rs
@@ -330,9 +330,6 @@ impl RunWithPathBuf {
                         if self.wasi.deny_multiple_wasi_versions {
                             let version_list = get_version_list(&wasi_versions);
                             bail!("Found more than 1 WASI version in this module ({}) and `--deny-multiple-wasi-versions` is enabled.", version_list);
-                        } else if !self.wasi.allow_multiple_wasi_versions {
-                            let version_list = get_version_list(&wasi_versions);
-                            warning!("Found more than 1 WASI version in this module ({}). If this is intentional, pass `--allow-multiple-wasi-versions` to suppress this warning.", version_list);
                         }
                     }
 

diff --git a/lib/cli/src/commands/run/wasi.rs b/lib/cli/src/commands/run/wasi.rs
@@ -101,10 +101,6 @@ pub struct Wasi {
     #[clap(long)]
     pub http_client: bool,
 
-    /// Allow WASI modules to import multiple versions of WASI without a warning.
-    #[clap(long = "allow-multiple-wasi-versions")]
-    pub allow_multiple_wasi_versions: bool,
-
     /// Require WASI modules to only import 1 version of WASI.
     #[clap(long = "deny-multiple-wasi-versions")]
     pub deny_multiple_wasi_versions: bool,

diff --git a/lib/wasi-types/schema/wasi/typenames.wit b/lib/wasi-types/schema/wasi/typenames.wit
@@ -254,52 +254,6 @@ enum errno {
     unknown,
 }
 
-enum bus-errno {
-    // TODO: wit appears to not have support for enum tag types
-    //(@witx tag u32)
-
-    /// No error occurred. Call completed successfully.
-    success,
-    /// Failed during serialization
-    ser,
-    /// Failed during deserialization
-    des,
-    /// Invalid WAPM process
-    wapm,
-    /// Failed to fetch the WAPM process
-    fetch,
-    /// Failed to compile the WAPM process
-    compile,
-    /// Invalid ABI
-    abi,
-    /// Call was aborted
-    aborted,
-    /// Bad handle
-    badhandle,
-    /// Invalid topic
-    topic,
-    /// Invalid callback
-    badcb,
-    /// Call is unsupported
-    unsupported,
-    /// Bad request
-    badrequest,
-    /// Access denied
-    denied,
-    /// Internal error has occured
-    internal,
-    /// Memory allocation failed
-    alloc,
-    /// Invocation has failed
-    invoke,
-    /// Already consumed
-    consumed,
-    /// Memory access violation
-    memviolation,
-    /// Some other unhandled error. If you see this, it's probably a bug.
-    unknown,
-}
-
 /// File descriptor rights, determining which actions may be performed.
 flags rights {
     // TODO: wit doesnt appear to support repr
@@ -422,8 +376,10 @@ enum filetype {
     socket-stream, 
     /// The file refers to a symbolic link inode.
     symbolic-link,
-    /// The file descriptor or file refers to a FIFO.
-    fifo,
+    /// The file descriptor or file refers to a raw socket.
+    socket-raw,
+    /// The file descriptor or file refers to a sequential packet socket.
+    socket-seqpacket
 }
 
 /// A directory entry, snapshot0 version.
@@ -695,8 +651,9 @@ record subscription-fs-readwrite {
 // }
 
 enum socktype {
-    dgram,
+    unknown,
     %stream,
+    dgram,
     raw,
     seqpacket,
 }
@@ -798,26 +755,12 @@ record tty {
     line-buffered: bool,
 }
 
-type bid = u32
-
-type cid = u64
-
 /// __wasi_option_t
 enum option-tag {
     none,
     some,
 }
 
-record option-bid {
-    tag: option-tag,
-    bid: bid
-}
-
-record option-cid {
-    tag: option-tag,
-    cid: cid
-}
-
 record option-pid {
     tag: option-tag,
     pid: pid
@@ -828,8 +771,6 @@ record option-fd {
     fd: fd
 }
 
-type exit-code = errno
-
 type event-fd-flags = u16
 
 record prestat-u-dir {
@@ -1142,7 +1083,7 @@ record option-timestamp {
 }
 
 enum signal {
-    sigunknown,
+    signone,
     sighup,
     sigint,
     sigquit,