From e5bde5b0d7d26dff706a066e3d8c183d73e730a6 Mon Sep 17 00:00:00 2001 From: NikVolf Date: Tue, 9 Apr 2019 20:19:48 +0300 Subject: [PATCH] update fmt --- src/func.rs | 4 ++-- src/global.rs | 4 ++-- src/host.rs | 2 +- src/memory.rs | 8 ++++---- src/module.rs | 6 +++--- src/runner.rs | 8 ++++---- src/table.rs | 6 +++--- src/tests/mod.rs | 2 +- src/tests/wasm.rs | 2 +- src/validation/context.rs | 2 +- src/validation/func.rs | 2 +- src/validation/util.rs | 2 +- src/value.rs | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/func.rs b/src/func.rs index 0a6aa0c..db7f89b 100644 --- a/src/func.rs +++ b/src/func.rs @@ -1,15 +1,15 @@ #[allow(unused_imports)] use crate::alloc::prelude::v1::*; use crate::alloc::rc::{Rc, Weak}; -use core::fmt; use crate::host::Externals; use crate::isa; use crate::module::ModuleInstance; -use parity_wasm::elements::Local; use crate::runner::{check_function_args, Interpreter, InterpreterState}; use crate::types::ValueType; use crate::value::RuntimeValue; use crate::{Signature, Trap}; +use core::fmt; +use parity_wasm::elements::Local; /// Reference to a function (See [`FuncInstance`] for details). /// diff --git a/src/global.rs b/src/global.rs index 6330615..007b136 100644 --- a/src/global.rs +++ b/src/global.rs @@ -1,9 +1,9 @@ use crate::alloc::rc::Rc; -use core::cell::Cell; -use parity_wasm::elements::ValueType as EValueType; use crate::types::ValueType; use crate::value::RuntimeValue; use crate::Error; +use core::cell::Cell; +use parity_wasm::elements::ValueType as EValueType; /// Reference to a global variable (See [`GlobalInstance`] for details). /// diff --git a/src/host.rs b/src/host.rs index 122492f..81d3a17 100644 --- a/src/host.rs +++ b/src/host.rs @@ -1,6 +1,6 @@ -use core::any::TypeId; use crate::value::{FromRuntimeValue, RuntimeValue}; use crate::{Trap, TrapKind}; +use core::any::TypeId; /// Wrapper around slice of [`RuntimeValue`] for using it /// as an argument list conveniently. diff --git a/src/memory.rs b/src/memory.rs index a7f7061..41aefb2 100644 --- a/src/memory.rs +++ b/src/memory.rs @@ -1,15 +1,15 @@ #[allow(unused_imports)] use crate::alloc::prelude::v1::*; use crate::alloc::rc::Rc; +use crate::memory_units::{Bytes, Pages, RoundUpTo}; +use crate::value::LittleEndianConvert; +use crate::Error; use core::cell::{Cell, RefCell}; use core::cmp; use core::fmt; use core::ops::Range; use core::u32; -use crate::memory_units::{Bytes, Pages, RoundUpTo}; use parity_wasm::elements::ResizableLimits; -use crate::value::LittleEndianConvert; -use crate::Error; /// Size of a page of [linear memory][`MemoryInstance`] - 64KiB. /// @@ -579,8 +579,8 @@ mod tests { use super::{MemoryInstance, MemoryRef, LINEAR_MEMORY_PAGE_SIZE}; use crate::memory_units::Pages; - use std::rc::Rc; use crate::Error; + use std::rc::Rc; #[test] fn alloc() { diff --git a/src/module.rs b/src/module.rs index a99bb35..a144f6a 100644 --- a/src/module.rs +++ b/src/module.rs @@ -1,9 +1,9 @@ #[allow(unused_imports)] use crate::alloc::prelude::v1::*; use crate::alloc::rc::Rc; +use crate::Trap; use core::cell::RefCell; use core::fmt; -use crate::Trap; #[cfg(not(feature = "std"))] use hashbrown::HashMap; @@ -11,17 +11,17 @@ use hashbrown::HashMap; use std::collections::HashMap; use crate::common::{DEFAULT_MEMORY_INDEX, DEFAULT_TABLE_INDEX}; -use core::cell::Ref; use crate::func::{FuncBody, FuncInstance, FuncRef}; use crate::global::{GlobalInstance, GlobalRef}; use crate::host::Externals; use crate::imports::ImportResolver; use crate::memory::MemoryRef; use crate::memory_units::Pages; -use parity_wasm::elements::{External, InitExpr, Instruction, Internal, ResizableLimits, Type}; use crate::table::TableRef; use crate::types::{GlobalDescriptor, MemoryDescriptor, TableDescriptor}; use crate::{Error, MemoryInstance, Module, RuntimeValue, Signature, TableInstance}; +use core::cell::Ref; +use parity_wasm::elements::{External, InitExpr, Instruction, Internal, ResizableLimits, Type}; /// Reference to a [`ModuleInstance`]. /// diff --git a/src/runner.rs b/src/runner.rs index bc16396..80f3eb5 100644 --- a/src/runner.rs +++ b/src/runner.rs @@ -1,9 +1,6 @@ #[allow(unused_imports)] use crate::alloc::prelude::v1::*; use crate::common::{DEFAULT_MEMORY_INDEX, DEFAULT_TABLE_INDEX}; -use core::fmt; -use core::ops; -use core::{u32, usize}; use crate::func::{FuncInstance, FuncInstanceInternal, FuncRef}; use crate::host::Externals; use crate::isa; @@ -11,12 +8,15 @@ use crate::memory::MemoryRef; use crate::memory_units::Pages; use crate::module::ModuleRef; use crate::nan_preserving_float::{F32, F64}; -use parity_wasm::elements::Local; use crate::value::{ ArithmeticOps, ExtendInto, Float, Integer, LittleEndianConvert, RuntimeValue, TransmuteInto, TryTruncateInto, WrapInto, }; use crate::{Signature, Trap, TrapKind, ValueType}; +use core::fmt; +use core::ops; +use core::{u32, usize}; +use parity_wasm::elements::Local; /// Maximum number of entries in value stack. pub const DEFAULT_VALUE_STACK_LIMIT: usize = (1024 * 1024) / ::core::mem::size_of::(); diff --git a/src/table.rs b/src/table.rs index 288c304..5d6099a 100644 --- a/src/table.rs +++ b/src/table.rs @@ -1,13 +1,13 @@ #[allow(unused_imports)] use crate::alloc::prelude::v1::*; use crate::alloc::rc::Rc; +use crate::func::FuncRef; +use crate::module::check_limits; +use crate::Error; use core::cell::RefCell; use core::fmt; use core::u32; -use crate::func::FuncRef; -use crate::module::check_limits; use parity_wasm::elements::ResizableLimits; -use crate::Error; /// Reference to a table (See [`TableInstance`] for details). /// diff --git a/src/tests/mod.rs b/src/tests/mod.rs index 7515de8..68d6c8e 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -1,5 +1,5 @@ -use wabt; use crate::Module; +use wabt; mod host; mod wasm; diff --git a/src/tests/wasm.rs b/src/tests/wasm.rs index c484546..26ed966 100644 --- a/src/tests/wasm.rs +++ b/src/tests/wasm.rs @@ -1,10 +1,10 @@ use crate::memory_units::Pages; -use std::fs::File; use crate::{ Error, FuncRef, GlobalDescriptor, GlobalInstance, GlobalRef, ImportsBuilder, MemoryDescriptor, MemoryInstance, MemoryRef, Module, ModuleImportResolver, ModuleInstance, NopExternals, RuntimeValue, Signature, TableDescriptor, TableInstance, TableRef, }; +use std::fs::File; struct Env { table_base: GlobalRef, diff --git a/src/validation/context.rs b/src/validation/context.rs index 2d97b02..9b8fc34 100644 --- a/src/validation/context.rs +++ b/src/validation/context.rs @@ -1,9 +1,9 @@ #[allow(unused_imports)] use crate::alloc::prelude::v1::*; +use crate::validation::Error; use parity_wasm::elements::{ BlockType, FunctionType, GlobalType, MemoryType, TableType, ValueType, }; -use crate::validation::Error; #[derive(Default, Debug)] pub struct ModuleContext { diff --git a/src/validation/func.rs b/src/validation/func.rs index 8a20151..e91d0f6 100644 --- a/src/validation/func.rs +++ b/src/validation/func.rs @@ -1,9 +1,9 @@ #[allow(unused_imports)] use crate::alloc::prelude::v1::*; use crate::common::{DEFAULT_MEMORY_INDEX, DEFAULT_TABLE_INDEX}; +use crate::validation::context::ModuleContext; use core::u32; use parity_wasm::elements::{BlockType, Func, FuncBody, Instruction, TableElementType, ValueType}; -use crate::validation::context::ModuleContext; use crate::validation::util::Locals; use crate::validation::Error; diff --git a/src/validation/util.rs b/src/validation/util.rs index bcbf4a5..a2615ff 100644 --- a/src/validation/util.rs +++ b/src/validation/util.rs @@ -1,7 +1,7 @@ #[allow(unused_imports)] use crate::alloc::prelude::v1::*; -use parity_wasm::elements::{Local, ValueType}; use crate::validation::Error; +use parity_wasm::elements::{Local, ValueType}; /// Locals are the concatenation of a slice of function parameters /// with function declared local variables. diff --git a/src/value.rs b/src/value.rs index 8ec900c..53147f8 100644 --- a/src/value.rs +++ b/src/value.rs @@ -1,7 +1,7 @@ -use core::{f32, i32, i64, u32, u64}; use crate::nan_preserving_float::{F32, F64}; use crate::types::ValueType; use crate::TrapKind; +use core::{f32, i32, i64, u32, u64}; /// Error for `LittleEndianConvert` #[derive(Debug)]