From 4efac38231f10e1481dc31102097ad71777bf23b Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 19 Feb 2020 12:47:21 -0800 Subject: [PATCH] rustfmt --- crates/api/src/func.rs | 3 ++- crates/api/src/trampoline/func.rs | 2 +- crates/jit/src/imports.rs | 4 ++-- crates/runtime/src/export.rs | 4 ++-- crates/runtime/src/instance.rs | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/crates/api/src/func.rs b/crates/api/src/func.rs index 26c3c45a4ed5..1c197a1f5606 100644 --- a/crates/api/src/func.rs +++ b/crates/api/src/func.rs @@ -368,7 +368,8 @@ impl Func { // Each function signature in a module should have a trampoline stored // on that module as well, so unwrap the result here since otherwise // it's a bug in wasmtime. - let trampoline = instance_handle.trampoline(export.signature) + let trampoline = instance_handle + .trampoline(export.signature) .expect("failed to retrieve trampoline from module"); let callable = WasmtimeFn::new(store, instance_handle, export, trampoline); diff --git a/crates/api/src/trampoline/func.rs b/crates/api/src/trampoline/func.rs index d29217580ff4..45b67912bdda 100644 --- a/crates/api/src/trampoline/func.rs +++ b/crates/api/src/trampoline/func.rs @@ -4,8 +4,8 @@ use super::create_handle::create_handle; use crate::{Callable, FuncType, Store, Trap, Val}; use anyhow::{bail, Result}; use std::any::Any; -use std::collections::HashMap; use std::cmp; +use std::collections::HashMap; use std::mem; use std::panic::{self, AssertUnwindSafe}; use std::rc::Rc; diff --git a/crates/jit/src/imports.rs b/crates/jit/src/imports.rs index 6fd1b24b9c79..cf95a0f4a07e 100644 --- a/crates/jit/src/imports.rs +++ b/crates/jit/src/imports.rs @@ -7,8 +7,8 @@ use wasmtime_environ::entity::PrimaryMap; use wasmtime_environ::wasm::{Global, GlobalInit, Memory, Table, TableElementType}; use wasmtime_environ::{MemoryPlan, MemoryStyle, Module, TablePlan}; use wasmtime_runtime::{ - Export, Imports, InstanceHandle, LinkError, VMFunctionImport, VMGlobalImport, VMMemoryImport, - VMTableImport, SignatureRegistry, + Export, Imports, InstanceHandle, LinkError, SignatureRegistry, VMFunctionImport, + VMGlobalImport, VMMemoryImport, VMTableImport, }; /// This function allows to match all imports of a `Module` with concrete definitions provided by diff --git a/crates/runtime/src/export.rs b/crates/runtime/src/export.rs index 17e0e27d4576..8cf42b8f8f24 100644 --- a/crates/runtime/src/export.rs +++ b/crates/runtime/src/export.rs @@ -1,6 +1,6 @@ use crate::vmcontext::{ - VMContext, VMFunctionBody, VMGlobalDefinition, VMMemoryDefinition, VMTableDefinition, - VMSharedSignatureIndex, + VMContext, VMFunctionBody, VMGlobalDefinition, VMMemoryDefinition, VMSharedSignatureIndex, + VMTableDefinition, }; use wasmtime_environ::wasm::Global; use wasmtime_environ::{MemoryPlan, TablePlan}; diff --git a/crates/runtime/src/instance.rs b/crates/runtime/src/instance.rs index b6e4a459df18..4c7c4ff089d9 100644 --- a/crates/runtime/src/instance.rs +++ b/crates/runtime/src/instance.rs @@ -21,7 +21,7 @@ use more_asserts::assert_lt; use std::alloc::{self, Layout}; use std::any::Any; use std::cell::Cell; -use std::collections::{HashSet, HashMap}; +use std::collections::{HashMap, HashSet}; use std::convert::TryFrom; use std::rc::Rc; use std::sync::Arc;