From 9160d3a6d6fc3a0d22b932b7f4fc9ca4df5019c0 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Mon, 22 Mar 2021 12:10:39 +0100 Subject: [PATCH] feat: Use latest version of `loupe`. --- Cargo.lock | 2 +- lib/api/src/module.rs | 2 +- lib/compiler-llvm/src/config.rs | 2 +- lib/compiler/src/address_map.rs | 2 +- lib/compiler/src/function.rs | 2 +- lib/compiler/src/jump_table.rs | 2 +- lib/compiler/src/module.rs | 2 +- lib/compiler/src/relocation.rs | 2 +- lib/compiler/src/section.rs | 2 +- lib/compiler/src/sourceloc.rs | 2 +- lib/compiler/src/target.rs | 2 +- lib/compiler/src/trap.rs | 2 +- lib/compiler/src/unwind.rs | 2 +- lib/engine-jit/src/artifact.rs | 4 ++-- lib/engine-jit/src/serialize.rs | 2 +- lib/engine-native/src/artifact.rs | 4 ++-- lib/engine-native/src/engine.rs | 2 +- lib/engine-native/src/serialize.rs | 2 +- lib/engine-object-file/src/artifact.rs | 2 +- lib/engine-object-file/src/serialize.rs | 2 +- lib/engine/src/serialize.rs | 2 +- lib/engine/src/trap/frame_info.rs | 2 +- lib/vm/src/global.rs | 2 +- lib/vm/src/lib.rs | 2 +- lib/vm/src/libcalls.rs | 2 +- lib/vm/src/memory.rs | 1 - lib/vm/src/module.rs | 2 +- lib/vm/src/table.rs | 1 - lib/vm/src/trap/trapcode.rs | 2 +- lib/wasmer-types/src/initializers.rs | 2 +- 30 files changed, 30 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1223629af63..4f48c1e1e99 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1160,9 +1160,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0700ebea6c2a63815aa6f376f1c6dac93223d7b11c4728a7f71ff951a6eca67" dependencies = [ + "indexmap", "loupe-derive", "rustversion", - "indexmap", ] [[package]] diff --git a/lib/api/src/module.rs b/lib/api/src/module.rs index 7702fb56dcf..ea2b8b8d8a8 100644 --- a/lib/api/src/module.rs +++ b/lib/api/src/module.rs @@ -1,7 +1,7 @@ use crate::store::Store; use crate::types::{ExportType, ImportType}; use crate::InstantiationError; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::fmt; use std::io; use std::path::Path; diff --git a/lib/compiler-llvm/src/config.rs b/lib/compiler-llvm/src/config.rs index fdcc5fad3f6..245a27e92f6 100644 --- a/lib/compiler-llvm/src/config.rs +++ b/lib/compiler-llvm/src/config.rs @@ -5,7 +5,7 @@ use inkwell::targets::{ }; pub use inkwell::OptimizationLevel as LLVMOptLevel; use itertools::Itertools; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::fmt::Debug; use std::sync::Arc; use target_lexicon::Architecture; diff --git a/lib/compiler/src/address_map.rs b/lib/compiler/src/address_map.rs index ab6b227da50..4fd8c1a2396 100644 --- a/lib/compiler/src/address_map.rs +++ b/lib/compiler/src/address_map.rs @@ -3,7 +3,7 @@ use crate::lib::std::vec::Vec; use crate::sourceloc::SourceLoc; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize}; diff --git a/lib/compiler/src/function.rs b/lib/compiler/src/function.rs index f2567559d42..e431f3bb7e0 100644 --- a/lib/compiler/src/function.rs +++ b/lib/compiler/src/function.rs @@ -12,7 +12,7 @@ use crate::lib::std::vec::Vec; use crate::section::{CustomSection, SectionIndex}; use crate::trap::TrapInformation; use crate::{CompiledFunctionUnwindInfo, FunctionAddressMap, JumpTableOffsets, Relocation}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize}; use wasmer_types::entity::PrimaryMap; diff --git a/lib/compiler/src/jump_table.rs b/lib/compiler/src/jump_table.rs index 5f4ff41c500..25fdbb60c08 100644 --- a/lib/compiler/src/jump_table.rs +++ b/lib/compiler/src/jump_table.rs @@ -5,7 +5,7 @@ //! [Learn more](https://en.wikipedia.org/wiki/Branch_table). use super::CodeOffset; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize}; use wasmer_types::entity::{entity_impl, SecondaryMap}; diff --git a/lib/compiler/src/module.rs b/lib/compiler/src/module.rs index a0e90c18684..b7882131295 100644 --- a/lib/compiler/src/module.rs +++ b/lib/compiler/src/module.rs @@ -1,5 +1,5 @@ use crate::lib::std::sync::Arc; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize}; use wasmer_types::entity::PrimaryMap; diff --git a/lib/compiler/src/relocation.rs b/lib/compiler/src/relocation.rs index 8e110a27489..25cec340ad9 100644 --- a/lib/compiler/src/relocation.rs +++ b/lib/compiler/src/relocation.rs @@ -13,7 +13,7 @@ use crate::lib::std::fmt; use crate::lib::std::vec::Vec; use crate::section::SectionIndex; use crate::{Addend, CodeOffset, JumpTable}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize}; use wasmer_types::entity::PrimaryMap; diff --git a/lib/compiler/src/section.rs b/lib/compiler/src/section.rs index 8879a457368..f6f3ee40484 100644 --- a/lib/compiler/src/section.rs +++ b/lib/compiler/src/section.rs @@ -7,7 +7,7 @@ use crate::lib::std::vec::Vec; use crate::Relocation; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize}; use wasmer_types::entity::entity_impl; diff --git a/lib/compiler/src/sourceloc.rs b/lib/compiler/src/sourceloc.rs index 82b3577d44f..fa61e4ab897 100644 --- a/lib/compiler/src/sourceloc.rs +++ b/lib/compiler/src/sourceloc.rs @@ -8,7 +8,7 @@ //! and tracing errors. use crate::lib::std::fmt; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize}; diff --git a/lib/compiler/src/target.rs b/lib/compiler/src/target.rs index 1f569b3d5b9..12b2b06f1c6 100644 --- a/lib/compiler/src/target.rs +++ b/lib/compiler/src/target.rs @@ -3,7 +3,7 @@ use crate::error::ParseCpuFeatureError; use crate::lib::std::str::FromStr; use crate::lib::std::string::{String, ToString}; use enumset::{EnumSet, EnumSetType}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; pub use target_lexicon::{ Architecture, BinaryFormat, CallingConvention, Endianness, OperatingSystem, PointerWidth, Triple, diff --git a/lib/compiler/src/trap.rs b/lib/compiler/src/trap.rs index e52767bbe32..80aecc73a3b 100644 --- a/lib/compiler/src/trap.rs +++ b/lib/compiler/src/trap.rs @@ -1,5 +1,5 @@ use crate::CodeOffset; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize}; use wasmer_vm::TrapCode; diff --git a/lib/compiler/src/unwind.rs b/lib/compiler/src/unwind.rs index fce474a7f21..128c300deab 100644 --- a/lib/compiler/src/unwind.rs +++ b/lib/compiler/src/unwind.rs @@ -6,7 +6,7 @@ //! //! [Learn more](https://en.wikipedia.org/wiki/Call_stack). use crate::lib::std::vec::Vec; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize}; diff --git a/lib/engine-jit/src/artifact.rs b/lib/engine-jit/src/artifact.rs index fdba309690e..d0a548bb8b2 100644 --- a/lib/engine-jit/src/artifact.rs +++ b/lib/engine-jit/src/artifact.rs @@ -6,7 +6,7 @@ use crate::link::link_module; #[cfg(feature = "compiler")] use crate::serialize::SerializableCompilation; use crate::serialize::SerializableModule; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::sync::{Arc, Mutex}; use wasmer_compiler::{CompileError, Features, Triple}; #[cfg(feature = "compiler")] @@ -31,7 +31,7 @@ use wasmer_vm::{ pub struct JITArtifact { serializable: SerializableModule, finished_functions: BoxedSlice, - #[memoryusage(ignore)] + #[loupe(skip)] finished_function_call_trampolines: BoxedSlice, finished_dynamic_function_trampolines: BoxedSlice, signatures: BoxedSlice, diff --git a/lib/engine-jit/src/serialize.rs b/lib/engine-jit/src/serialize.rs index b02823a5393..c924381b9a0 100644 --- a/lib/engine-jit/src/serialize.rs +++ b/lib/engine-jit/src/serialize.rs @@ -1,4 +1,4 @@ -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use serde::{Deserialize, Serialize}; use wasmer_compiler::{ CompileModuleInfo, CustomSection, Dwarf, FunctionBody, JumpTableOffsets, Relocation, diff --git a/lib/engine-native/src/artifact.rs b/lib/engine-native/src/artifact.rs index c767a576dbb..7f93b3f97e4 100644 --- a/lib/engine-native/src/artifact.rs +++ b/lib/engine-native/src/artifact.rs @@ -4,7 +4,7 @@ use crate::engine::{NativeEngine, NativeEngineInner}; use crate::serialize::ModuleMetadata; use libloading::{Library, Symbol as LibrarySymbol}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::error::Error; use std::fs::File; use std::io::{Read, Write}; @@ -43,7 +43,7 @@ pub struct NativeArtifact { sharedobject_path: PathBuf, metadata: ModuleMetadata, finished_functions: BoxedSlice, - #[memoryusage(ignore)] + #[loupe(skip)] finished_function_call_trampolines: BoxedSlice, finished_dynamic_function_trampolines: BoxedSlice, signatures: BoxedSlice, diff --git a/lib/engine-native/src/engine.rs b/lib/engine-native/src/engine.rs index a7797b98a57..84f857fd6d6 100644 --- a/lib/engine-native/src/engine.rs +++ b/lib/engine-native/src/engine.rs @@ -2,7 +2,7 @@ use crate::NativeArtifact; use libloading::Library; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::path::Path; use std::sync::Arc; use std::sync::Mutex; diff --git a/lib/engine-native/src/serialize.rs b/lib/engine-native/src/serialize.rs index b1bdf0595f6..47c012d77fa 100644 --- a/lib/engine-native/src/serialize.rs +++ b/lib/engine-native/src/serialize.rs @@ -1,4 +1,4 @@ -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use serde::{Deserialize, Serialize}; use wasmer_compiler::{CompileModuleInfo, SectionIndex, Symbol, SymbolRegistry}; use wasmer_types::entity::{EntityRef, PrimaryMap}; diff --git a/lib/engine-object-file/src/artifact.rs b/lib/engine-object-file/src/artifact.rs index 46c37026993..d5314f012a7 100644 --- a/lib/engine-object-file/src/artifact.rs +++ b/lib/engine-object-file/src/artifact.rs @@ -3,7 +3,7 @@ use crate::engine::{ObjectFileEngine, ObjectFileEngineInner}; use crate::serialize::{ModuleMetadata, ModuleMetadataSymbolRegistry}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::collections::BTreeMap; use std::error::Error; use std::mem; diff --git a/lib/engine-object-file/src/serialize.rs b/lib/engine-object-file/src/serialize.rs index 30143a66a4e..4077b68e667 100644 --- a/lib/engine-object-file/src/serialize.rs +++ b/lib/engine-object-file/src/serialize.rs @@ -1,4 +1,4 @@ -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use serde::{Deserialize, Serialize}; use wasmer_compiler::{CompileModuleInfo, SectionIndex, Symbol, SymbolRegistry}; use wasmer_types::entity::{EntityRef, PrimaryMap}; diff --git a/lib/engine/src/serialize.rs b/lib/engine/src/serialize.rs index 240fba41c60..a36b47da320 100644 --- a/lib/engine/src/serialize.rs +++ b/lib/engine/src/serialize.rs @@ -1,4 +1,4 @@ -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use serde::de::{Deserializer, Visitor}; use serde::ser::Serializer; use serde::{Deserialize, Serialize}; diff --git a/lib/engine/src/trap/frame_info.rs b/lib/engine/src/trap/frame_info.rs index c479e23418c..3407ab742db 100644 --- a/lib/engine/src/trap/frame_info.rs +++ b/lib/engine/src/trap/frame_info.rs @@ -11,7 +11,7 @@ //! FRAME_INFO.register(module, compiled_functions); //! ``` use crate::serialize::SerializableFunctionFrameInfo; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::cmp; use std::collections::BTreeMap; use std::sync::{Arc, RwLock}; diff --git a/lib/vm/src/global.rs b/lib/vm/src/global.rs index e04825807ff..35f41fdfdf8 100644 --- a/lib/vm/src/global.rs +++ b/lib/vm/src/global.rs @@ -1,5 +1,5 @@ use crate::vmcontext::VMGlobalDefinition; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::cell::UnsafeCell; use std::ptr::NonNull; use std::sync::Mutex; diff --git a/lib/vm/src/lib.rs b/lib/vm/src/lib.rs index 57753fca960..8d63c303951 100644 --- a/lib/vm/src/lib.rs +++ b/lib/vm/src/lib.rs @@ -56,7 +56,7 @@ pub use crate::vmcontext::{ VMTableImport, VMTrampoline, }; pub use crate::vmoffsets::{TargetSharedSignatureIndex, VMOffsets}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; /// Version number of this crate. pub const VERSION: &str = env!("CARGO_PKG_VERSION"); diff --git a/lib/vm/src/libcalls.rs b/lib/vm/src/libcalls.rs index 00c50b4fafa..a602af1ac9e 100644 --- a/lib/vm/src/libcalls.rs +++ b/lib/vm/src/libcalls.rs @@ -38,7 +38,7 @@ use crate::probestack::PROBESTACK; use crate::trap::{raise_lib_trap, Trap, TrapCode}; use crate::vmcontext::VMContext; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use serde::{Deserialize, Serialize}; use std::fmt; use wasmer_types::{DataIndex, ElemIndex, LocalMemoryIndex, MemoryIndex, TableIndex}; diff --git a/lib/vm/src/memory.rs b/lib/vm/src/memory.rs index 037e9d05679..e64cfd132bf 100644 --- a/lib/vm/src/memory.rs +++ b/lib/vm/src/memory.rs @@ -8,7 +8,6 @@ use crate::mmap::Mmap; use crate::vmcontext::VMMemoryDefinition; use loupe::MemoryUsage; -use loupe_derive::MemoryUsage; use more_asserts::assert_ge; use serde::{Deserialize, Serialize}; use std::borrow::BorrowMut; diff --git a/lib/vm/src/module.rs b/lib/vm/src/module.rs index 6f7ccefffb8..d43aa5dceae 100644 --- a/lib/vm/src/module.rs +++ b/lib/vm/src/module.rs @@ -5,7 +5,7 @@ //! `wasmer::Module`. use indexmap::IndexMap; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use serde::{Deserialize, Serialize}; use std::collections::HashMap; use std::fmt; diff --git a/lib/vm/src/table.rs b/lib/vm/src/table.rs index aa423bee36d..90f2069a165 100644 --- a/lib/vm/src/table.rs +++ b/lib/vm/src/table.rs @@ -8,7 +8,6 @@ use crate::trap::{Trap, TrapCode}; use crate::vmcontext::{VMCallerCheckedAnyfunc, VMTableDefinition}; use loupe::MemoryUsage; -use loupe_derive::MemoryUsage; use serde::{Deserialize, Serialize}; use std::borrow::{Borrow, BorrowMut}; use std::cell::UnsafeCell; diff --git a/lib/vm/src/trap/trapcode.rs b/lib/vm/src/trap/trapcode.rs index e3740339e9b..31a25765f4f 100644 --- a/lib/vm/src/trap/trapcode.rs +++ b/lib/vm/src/trap/trapcode.rs @@ -5,7 +5,7 @@ use core::fmt::{self, Display, Formatter}; use core::str::FromStr; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use serde::{Deserialize, Serialize}; use thiserror::Error; diff --git a/lib/wasmer-types/src/initializers.rs b/lib/wasmer-types/src/initializers.rs index d8cf3d51b1c..3683ecf04a8 100644 --- a/lib/wasmer-types/src/initializers.rs +++ b/lib/wasmer-types/src/initializers.rs @@ -1,6 +1,6 @@ use crate::indexes::{FunctionIndex, GlobalIndex, MemoryIndex, TableIndex}; use crate::lib::std::boxed::Box; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; #[cfg(feature = "enable-serde")] use serde::{Deserialize, Serialize};