diff --git a/lib/cretonne/src/dbg.rs b/lib/cretonne/src/dbg.rs index 7e5cd2777c..ace22b6c47 100644 --- a/lib/cretonne/src/dbg.rs +++ b/lib/cretonne/src/dbg.rs @@ -8,7 +8,6 @@ /// /// The output will appear in files named `cretonne.dbg.*`, where the suffix is named after the /// thread doing the logging. - #[cfg(not(feature = "no_std"))] use std::cell::RefCell; #[cfg(not(feature = "no_std"))] diff --git a/lib/cretonne/src/lib.rs b/lib/cretonne/src/lib.rs index c448cc1d0f..22914cc17b 100644 --- a/lib/cretonne/src/lib.rs +++ b/lib/cretonne/src/lib.rs @@ -76,4 +76,4 @@ mod std { pub mod error { pub use error_core::Error; } -} \ No newline at end of file +} diff --git a/lib/cretonne/src/simple_gvn.rs b/lib/cretonne/src/simple_gvn.rs index e0350ad687..8f09398c82 100644 --- a/lib/cretonne/src/simple_gvn.rs +++ b/lib/cretonne/src/simple_gvn.rs @@ -7,8 +7,7 @@ use ir::{InstructionData, Function, Inst, Opcode, Type}; use scoped_hash_map::ScopedHashMap; use timing; -#[cfg(feature = "no_std")] -use alloc::Vec; +use std::vec::Vec; /// Test whether the given opcode is unsafe to even consider for GVN. fn trivially_unsafe_for_gvn(opcode: Opcode) -> bool { diff --git a/lib/cretonne/src/topo_order.rs b/lib/cretonne/src/topo_order.rs index 660179f1f9..f2c57f8166 100644 --- a/lib/cretonne/src/topo_order.rs +++ b/lib/cretonne/src/topo_order.rs @@ -4,8 +4,7 @@ use entity::SparseSet; use dominator_tree::DominatorTree; use ir::{Ebb, Layout}; -#[cfg(feature = "no_std")] -use alloc::Vec; +use std::vec::Vec; /// Present EBBs in a topological order such that all dominating EBBs are guaranteed to be visited /// before the current EBB. diff --git a/lib/frontend/src/lib.rs b/lib/frontend/src/lib.rs index 37a3504bf5..84af6f976b 100644 --- a/lib/frontend/src/lib.rs +++ b/lib/frontend/src/lib.rs @@ -161,4 +161,4 @@ mod ssa; mod std { pub use alloc::vec; pub use core::*; -} \ No newline at end of file +} diff --git a/lib/wasm/src/code_translator.rs b/lib/wasm/src/code_translator.rs index ea33f311a9..4a66bce463 100644 --- a/lib/wasm/src/code_translator.rs +++ b/lib/wasm/src/code_translator.rs @@ -34,7 +34,6 @@ use std::collections::{HashMap, hash_map}; use environ::{FuncEnvironment, GlobalValue}; use std::{i32, u32}; -// this is for no_std builds, but has no affect on regular builds use std::vec::Vec; /// Translates wasm operators into Cretonne IL instructions. Returns `true` if it inserted diff --git a/lib/wasm/src/environ/dummy.rs b/lib/wasm/src/environ/dummy.rs index 9238cbf665..d0dba2c817 100644 --- a/lib/wasm/src/environ/dummy.rs +++ b/lib/wasm/src/environ/dummy.rs @@ -11,7 +11,6 @@ use cretonne::settings; use wasmparser; use std::error::Error; -// this is for no_std builds, but has no affect on regular builds use std::vec::Vec; use std::string::String; diff --git a/lib/wasm/src/environ/spec.rs b/lib/wasm/src/environ/spec.rs index c8a8f54111..dfc2685f33 100644 --- a/lib/wasm/src/environ/spec.rs +++ b/lib/wasm/src/environ/spec.rs @@ -6,7 +6,6 @@ use cretonne::settings::Flags; use translation_utils::{SignatureIndex, FunctionIndex, TableIndex, GlobalIndex, MemoryIndex, Global, Table, Memory}; -// this is for no_std builds, but has no affect on regular builds use std::vec::Vec; use std::string::String; diff --git a/lib/wasm/src/lib.rs b/lib/wasm/src/lib.rs index dde500af97..9005e6cd42 100644 --- a/lib/wasm/src/lib.rs +++ b/lib/wasm/src/lib.rs @@ -53,4 +53,4 @@ mod std { pub mod error { pub use error_core::Error; } -} \ No newline at end of file +} diff --git a/lib/wasm/src/module_translator.rs b/lib/wasm/src/module_translator.rs index 2786f9094e..43a47b68af 100644 --- a/lib/wasm/src/module_translator.rs +++ b/lib/wasm/src/module_translator.rs @@ -8,7 +8,6 @@ use sections_translator::{SectionParsingError, parse_function_signatures, parse_ parse_elements_section, parse_data_section}; use environ::ModuleEnvironment; -// this is for no_std builds, but has no affect on regular builds use std::string::String; /// Translate a sequence of bytes forming a valid Wasm binary into a list of valid Cretonne IL diff --git a/lib/wasm/src/sections_translator.rs b/lib/wasm/src/sections_translator.rs index ff641a6889..a1e172aa7c 100644 --- a/lib/wasm/src/sections_translator.rs +++ b/lib/wasm/src/sections_translator.rs @@ -17,7 +17,6 @@ use wasmparser; use std::str::from_utf8; use environ::ModuleEnvironment; -// this is for no_std builds, but has no affect on regular builds use std::vec::Vec; use std::string::String; diff --git a/lib/wasm/src/state.rs b/lib/wasm/src/state.rs index 625e39b4e9..cb8aebb653 100644 --- a/lib/wasm/src/state.rs +++ b/lib/wasm/src/state.rs @@ -8,7 +8,6 @@ use environ::{FuncEnvironment, GlobalValue}; use std::collections::HashMap; use translation_utils::{GlobalIndex, MemoryIndex, SignatureIndex, FunctionIndex}; -// this is for no_std builds, but has no affect on regular builds use std::vec::Vec; /// A control stack frame can be an `if`, a `block` or a `loop`, each one having the following