Merge pull request #379 from bytecodealliance/acf/safer-yield

Make yield methods take `&mut Vmctx`; update semver

Author: acfoltzer

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "lucet-module"
-version = "0.4.2"
+version = "0.5.0"
 description = "A structured interface for Lucet modules"
 homepage = "https://github.com/fastly/lucet"
 repository = "https://github.com/fastly/lucet"

lucet-module/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lucet-objdump"
-version = "0.4.2"
+version = "0.5.0"
 description = "Analyze object files emitted by the Lucet compiler"
 homepage = "https://github.com/fastly/lucet"
 repository = "https://github.com/fastly/lucet"
@@ -13,7 +13,7 @@ edition = "2018"
 goblin="0.0.24"
 byteorder="1.2.1"
 colored="1.8.0"
-lucet-module = { path = "../lucet-module", version = "0.4.2" }
+lucet-module = { path = "../lucet-module", version = "0.5.0" }
 
 [package.metadata.deb]
 name = "fst-lucet-objdump"

lucet-objdump/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lucet-runtime"
-version = "0.4.2"
+version = "0.5.0"
 description = "Pure Rust runtime for Lucet WebAssembly toolchain"
 homepage = "https://github.com/fastly/lucet"
 repository = "https://github.com/fastly/lucet"
@@ -11,18 +11,18 @@ edition = "2018"
 
 [dependencies]
 libc = "0.2.65"
-lucet-runtime-internals = { path = "lucet-runtime-internals", version = "0.4.2" }
-lucet-module = { path = "../lucet-module", version = "0.4.2" }
+lucet-runtime-internals = { path = "lucet-runtime-internals", version = "0.5.0" }
+lucet-module = { path = "../lucet-module", version = "0.5.0" }
 num-traits = "0.2"
 num-derive = "0.3.0"
 
 [dev-dependencies]
 byteorder = "1.2"
 failure = "0.1"
 lazy_static = "1.1"
-lucetc = { path = "../lucetc", version = "0.4.2" }
-lucet-runtime-tests = { path = "lucet-runtime-tests", version = "0.4.2" }
-lucet-wasi-sdk = { path = "../lucet-wasi-sdk", version = "0.4.2" }
+lucetc = { path = "../lucetc", version = "0.5.0" }
+lucet-runtime-tests = { path = "lucet-runtime-tests", version = "0.5.0" }
+lucet-wasi-sdk = { path = "../lucet-wasi-sdk", version = "0.5.0" }
 nix = "0.15"
 rayon = "1.0"
 tempfile = "3.0"

lucet-runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lucet-runtime-internals"
-version = "0.4.2"
+version = "0.5.0"
 description = "Pure Rust runtime for Lucet WebAssembly toolchain (internals)"
 homepage = "https://github.com/fastly/lucet"
 repository = "https://github.com/fastly/lucet"
@@ -10,8 +10,8 @@ authors = ["Lucet team <lucet@fastly.com>"]
 edition = "2018"
 
 [dependencies]
-lucet-module = { path = "../../lucet-module", version = "0.4.2" }
-lucet-runtime-macros = { path = "../lucet-runtime-macros", version = "0.4.2" }
+lucet-module = { path = "../../lucet-module", version = "0.5.0" }
+lucet-runtime-macros = { path = "../lucet-runtime-macros", version = "0.5.0" }
 
 bitflags = "1.0"
 bincode = "1.1.4"

lucet-runtime/lucet-runtime-internals/Cargo.toml

@@ -22,7 +22,7 @@
 /// }
 /// ```
 #[macro_export]
-#[deprecated(since = "0.4.2", note = "Use the #[lucet_hostcall] attribute instead")]
+#[deprecated(since = "0.5.0", note = "Use the #[lucet_hostcall] attribute instead")]
 macro_rules! lucet_hostcalls {
     {
         $(

lucet-runtime/lucet-runtime-internals/src/hostcall_macros.rs

@@ -78,7 +78,7 @@ pub trait VmctxInternal {
     ///
     /// The dynamic type checks used by the other yield methods should make this explicit option
     /// type redundant, however this interface is used to avoid exposing a panic to the C API.
-    fn yield_val_try_val<A: Any + 'static, R: Any + 'static>(&self, val: A) -> Option<R>;
+    fn yield_val_try_val<A: Any + 'static, R: Any + 'static>(&mut self, val: A) -> Option<R>;
 }
 
 impl VmctxInternal for Vmctx {
@@ -105,7 +105,7 @@ impl VmctxInternal for Vmctx {
         }
     }
 
-    fn yield_val_try_val<A: Any + 'static, R: Any + 'static>(&self, val: A) -> Option<R> {
+    fn yield_val_try_val<A: Any + 'static, R: Any + 'static>(&mut self, val: A) -> Option<R> {
         self.yield_impl::<A, R>(val);
         self.try_take_resumed_val()
     }
@@ -321,7 +321,7 @@ impl Vmctx {
     ///
     /// (The reason for the trailing underscore in the name is that Rust reserves `yield` as a
     /// keyword for future use.)
-    pub fn yield_(&self) {
+    pub fn yield_(&mut self) {
         self.yield_val_expecting_val::<EmptyYieldVal, EmptyYieldVal>(EmptyYieldVal);
     }
 
@@ -332,7 +332,7 @@ impl Vmctx {
     /// After suspending, the instance may be resumed by calling
     /// [`Instance::resume_with_val()`](../struct.Instance.html#method.resume_with_val) from the
     /// host with a value of type `R`.
-    pub fn yield_expecting_val<R: Any + 'static>(&self) -> R {
+    pub fn yield_expecting_val<R: Any + 'static>(&mut self) -> R {
         self.yield_val_expecting_val::<EmptyYieldVal, R>(EmptyYieldVal)
     }
 
@@ -342,7 +342,7 @@ impl Vmctx {
     ///
     /// After suspending, the instance may be resumed by the host using
     /// [`Instance::resume()`](../struct.Instance.html#method.resume).
-    pub fn yield_val<A: Any + 'static>(&self, val: A) {
+    pub fn yield_val<A: Any + 'static>(&mut self, val: A) {
         self.yield_val_expecting_val::<A, EmptyYieldVal>(val);
     }
 
@@ -353,12 +353,12 @@ impl Vmctx {
     /// After suspending, the instance may be resumed by calling
     /// [`Instance::resume_with_val()`](../struct.Instance.html#method.resume_with_val) from the
     /// host with a value of type `R`.
-    pub fn yield_val_expecting_val<A: Any + 'static, R: Any + 'static>(&self, val: A) -> R {
+    pub fn yield_val_expecting_val<A: Any + 'static, R: Any + 'static>(&mut self, val: A) -> R {
         self.yield_impl::<A, R>(val);
         self.take_resumed_val()
     }
 
-    fn yield_impl<A: Any + 'static, R: Any + 'static>(&self, val: A) {
+    fn yield_impl<A: Any + 'static, R: Any + 'static>(&mut self, val: A) {
         let inst = unsafe { self.instance_mut() };
         let expecting: Box<PhantomData<R>> = Box::new(PhantomData);
         inst.state = State::Yielding {

lucet-runtime/lucet-runtime-internals/src/vmctx.rs

@@ -1,6 +1,6 @@
 [package]
 name = "lucet-runtime-macros"
-version = "0.4.2"
+version = "0.5.0"
 description = "Macros for the Lucet WebAssembly runtime"
 homepage = "https://github.com/bytecodealliance/lucet"
 repository = "https://github.com/bytecodealliance/lucet"