Merge remote-tracking branch 'upstream/main' into wip-05-09_wasm_cache

bytecodealliance · Aug 11, 2022 · fbcd271 · fbcd271
2 parents 254a285 + c1c48b4
commit fbcd271
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/crates/runtime/src/cow_disabled.rs b/crates/runtime/src/cow_disabled.rs
@@ -35,7 +35,9 @@ impl ModuleMemoryImages {
 /// places (e.g. a `Memory`), we define a zero-sized type when memory is
 /// not included in the build.
 #[derive(Debug)]
-pub enum MemoryImageSlot {}
+pub struct MemoryImageSlot {
+    _priv: (),
+}
 
 #[allow(dead_code)]
 impl MemoryImageSlot {
@@ -48,26 +50,26 @@ impl MemoryImageSlot {
         _: usize,
         _: Option<&Arc<MemoryImage>>,
     ) -> Result<Self, InstantiationError> {
-        match *self {}
+        unreachable!();
     }
 
     pub(crate) fn no_clear_on_drop(&mut self) {
-        match *self {}
+        unreachable!();
     }
 
     pub(crate) fn clear_and_remain_ready(&mut self) -> Result<()> {
-        match *self {}
+        unreachable!();
     }
 
     pub(crate) fn has_image(&self) -> bool {
-        match *self {}
+        unreachable!();
     }
 
     pub(crate) fn is_dirty(&self) -> bool {
-        match *self {}
+        unreachable!();
     }
 
     pub(crate) fn set_heap_limit(&mut self, _: usize) -> Result<()> {
-        match *self {}
+        unreachable!();
     }
 }
diff --git a/crates/runtime/src/lib.rs b/crates/runtime/src/lib.rs
@@ -19,7 +19,6 @@
         clippy::use_self
     )
 )]
-#![cfg_attr(not(memory_init_cow), allow(unused_variables, unreachable_code))]
 
 use anyhow::Error;
 use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};