From 666d565fd416cefd3f3ebcd5dcb430e9e3808251 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Sat, 23 Sep 2017 15:14:25 -0700 Subject: [PATCH] Clean up unused imports. --- lib/wasmstandalone/src/execution.rs | 6 +++--- lib/wasmstandalone/src/lib.rs | 1 - lib/wasmstandalone/src/standalone.rs | 7 ++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/wasmstandalone/src/execution.rs b/lib/wasmstandalone/src/execution.rs index 5551f6f651..1baa6f1518 100644 --- a/lib/wasmstandalone/src/execution.rs +++ b/lib/wasmstandalone/src/execution.rs @@ -1,6 +1,6 @@ use cretonne::Context; use cretonne::settings; -use cretonne::isa::{self, TargetIsa}; +use cretonne::isa::TargetIsa; use cretonne::verify_function; use cretonne::verifier; use cretonne::settings::Configurable; @@ -8,7 +8,7 @@ use cretonne::result::CtonError; use cretonne::ir::entities::AnyEntity; use cretonne::ir::{Ebb, FuncRef, JumpTable, Function}; use cretonne::binemit::{RelocSink, Reloc, CodeOffset}; -use cton_wasm::{TranslationResult, FunctionIndex, WasmRuntime}; +use cton_wasm::{TranslationResult, FunctionIndex}; use std::mem::transmute; use region::Protection; use region::protect; @@ -81,7 +81,7 @@ pub fn compile_module( ); let mut functions_metatada = Vec::new(); let mut functions_code = Vec::new(); - for (function_index, function) in trans_result.functions.iter().enumerate() { + for function in &trans_result.functions { let mut context = Context::new(); verify_function(function, isa).unwrap(); context.func = function.clone(); // TODO: Avoid this clone. diff --git a/lib/wasmstandalone/src/lib.rs b/lib/wasmstandalone/src/lib.rs index faa7f1d093..95d4accdc4 100644 --- a/lib/wasmstandalone/src/lib.rs +++ b/lib/wasmstandalone/src/lib.rs @@ -6,7 +6,6 @@ #![deny(missing_docs)] extern crate cretonne; -extern crate cton_frontend; extern crate cton_wasm; extern crate region; diff --git a/lib/wasmstandalone/src/standalone.rs b/lib/wasmstandalone/src/standalone.rs index a9c35968ce..13ef9a3a32 100644 --- a/lib/wasmstandalone/src/standalone.rs +++ b/lib/wasmstandalone/src/standalone.rs @@ -1,11 +1,8 @@ use cton_wasm::{FunctionIndex, GlobalIndex, TableIndex, MemoryIndex, Global, GlobalInit, Table, Memory, WasmRuntime, FuncEnvironment, GlobalValue, SignatureIndex}; -use cton_frontend::FunctionBuilder; -use cretonne::ir::{MemFlags, Value, InstBuilder, SigRef, FuncRef, ExtFuncData, FunctionName, - Signature, ArgumentType, CallConv}; +use cretonne::ir::{InstBuilder, FuncRef, ExtFuncData, FunctionName, Signature, ArgumentType, + CallConv}; use cretonne::ir::types::*; -use cretonne::ir::condcodes::IntCC; -use cretonne::ir::immediates::Offset32; use cretonne::cursor::FuncCursor; use cretonne::packed_option::PackedOption; use cretonne::ir;