From deb097c5850cd15a2fce910c84b9a2a1f29efd3f Mon Sep 17 00:00:00 2001
From: Ivan Enderlin <ivan@mnt.io>
Date: Tue, 23 Mar 2021 13:07:52 +0100
Subject: [PATCH] fix: Update `loupe` to 0.1.1.

---
 Cargo.lock                             |  8 ++++----
 examples/tunables_limit_memory.rs      | 10 ++--------
 lib/engine-object-file/src/artifact.rs |  2 +-
 tests/lib/engine-dummy/src/artifact.rs |  4 ++--
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4f48c1e1e99..3baa7f36750 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1156,9 +1156,9 @@ dependencies = [
 
 [[package]]
 name = "loupe"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0700ebea6c2a63815aa6f376f1c6dac93223d7b11c4728a7f71ff951a6eca67"
+checksum = "1acf065b51eb58abbc66a07c27ec63142205d339a9f5093dc3e1d7cda3d5c9a3"
 dependencies = [
  "indexmap",
  "loupe-derive",
@@ -1167,9 +1167,9 @@ dependencies = [
 
 [[package]]
 name = "loupe-derive"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9a2f753a29753600fa1e3f5c2b311babaca3bb66929bdc37082996e9c46cfb"
+checksum = "e40881c741681f26b0f4c0261f493c8df600998807184b524e34b7e208324834"
 dependencies = [
  "quote",
  "syn",
diff --git a/examples/tunables_limit_memory.rs b/examples/tunables_limit_memory.rs
index 14368249127..8d2f92d3b92 100644
--- a/examples/tunables_limit_memory.rs
+++ b/examples/tunables_limit_memory.rs
@@ -1,8 +1,7 @@
-use std::mem;
 use std::ptr::NonNull;
 use std::sync::Arc;
 
-use loupe::{MemoryUsage, MemoryUsageTracker};
+use loupe::MemoryUsage;
 use wasmer::{
     imports,
     vm::{self, MemoryError, MemoryStyle, TableStyle, VMMemoryDefinition, VMTableDefinition},
@@ -16,6 +15,7 @@ use wasmer_engine_jit::JIT;
 ///
 /// After adjusting the memory limits, it delegates all other logic
 /// to the base tunables.
+#[derive(MemoryUsage)]
 pub struct LimitingTunables<T: Tunables> {
     /// The maximum a linear memory is allowed to be (in Wasm pages, 64 KiB each).
     /// Since Wasmer ensures there is only none or one memory, this is practically
@@ -133,12 +133,6 @@ impl<T: Tunables> Tunables for LimitingTunables<T> {
     }
 }
 
-impl<T: Tunables> MemoryUsage for LimitingTunables<T> {
-    fn size_of_val(&self, _tracker: &mut dyn MemoryUsageTracker) -> usize {
-        mem::size_of_val(self)
-    }
-}
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // A Wasm module with one exported memory (min: 7 pages, max: unset)
     let wat = br#"(module (memory 7) (export "memory" (memory 0)))"#;
diff --git a/lib/engine-object-file/src/artifact.rs b/lib/engine-object-file/src/artifact.rs
index d5314f012a7..276f53cc060 100644
--- a/lib/engine-object-file/src/artifact.rs
+++ b/lib/engine-object-file/src/artifact.rs
@@ -36,7 +36,7 @@ pub struct ObjectFileArtifact {
     metadata: ModuleMetadata,
     module_bytes: Vec<u8>,
     finished_functions: BoxedSlice<LocalFunctionIndex, FunctionBodyPtr>,
-    #[memoryusage(ignore)]
+    #[loupe(skip)]
     finished_function_call_trampolines: BoxedSlice<SignatureIndex, VMTrampoline>,
     finished_dynamic_function_trampolines: BoxedSlice<FunctionIndex, FunctionBodyPtr>,
     signatures: BoxedSlice<SignatureIndex, VMSharedSignatureIndex>,
diff --git a/tests/lib/engine-dummy/src/artifact.rs b/tests/lib/engine-dummy/src/artifact.rs
index 89e3070a7f2..4467d22056c 100644
--- a/tests/lib/engine-dummy/src/artifact.rs
+++ b/tests/lib/engine-dummy/src/artifact.rs
@@ -2,7 +2,7 @@
 //! done as separate steps.
 
 use crate::engine::DummyEngine;
-use loupe_derive::MemoryUsage;
+use loupe::MemoryUsage;
 #[cfg(feature = "serialize")]
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
@@ -40,7 +40,7 @@ pub struct DummyArtifactMetadata {
 pub struct DummyArtifact {
     metadata: DummyArtifactMetadata,
     finished_functions: BoxedSlice<LocalFunctionIndex, FunctionBodyPtr>,
-    #[memoryusage(ignore)]
+    #[loupe(skip)]
     finished_function_call_trampolines: BoxedSlice<SignatureIndex, VMTrampoline>,
     finished_dynamic_function_trampolines: BoxedSlice<FunctionIndex, FunctionBodyPtr>,
     signatures: BoxedSlice<SignatureIndex, VMSharedSignatureIndex>,