Fix nightly

Cargo.toml

@@ -35,6 +35,8 @@ std = [
 ]
 # Enable for no_std support
 core = [
+    # `core` doesn't support vec_memory
+    "vec_memory",
     "wasmi-validation/core",
     "libm"
 ]

src/func.rs

@@ -1,6 +1,7 @@
-#[allow(unused_imports)]
+use alloc::{
-use alloc::prelude::v1::*;
+    rc::{Rc, Weak},
-use alloc::rc::{Rc, Weak};
+    vec::Vec,
+};
 use core::fmt;
 use host::Externals;
 use isa;

src/imports.rs

@@ -1,7 +1,4 @@
-#[allow(unused_imports)]
+use alloc::{collections::BTreeMap, string::String};
-use alloc::prelude::v1::*;
-
-use alloc::collections::BTreeMap;
 
 use func::FuncRef;
 use global::GlobalRef;

src/isa.rs

@@ -67,8 +67,7 @@
 //! - Reserved immediates are ignored for `call_indirect`, `current_memory`, `grow_memory`.
 //!
 
-#[allow(unused_imports)]
+use alloc::vec::Vec;
-use alloc::prelude::v1::*;
 
 /// Should we keep a value before "discarding" a stack frame?
 ///

src/lib.rs

@@ -96,8 +96,6 @@
 
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
-//// alloc is required in no_std
-#![cfg_attr(not(feature = "std"), feature(alloc, alloc_prelude))]
 
 #[cfg(not(feature = "std"))]
 #[macro_use]
@@ -119,8 +117,11 @@ extern crate parity_wasm;
 
 extern crate wasmi_validation as validation;
 
-#[allow(unused_imports)]
+use alloc::{
-use alloc::prelude::v1::*;
+    boxed::Box,
+    string::{String, ToString},
+    vec::Vec,
+};
 use core::fmt;
 #[cfg(feature = "std")]
 use std::error;

src/memory/mod.rs

@@ -1,6 +1,4 @@
-#[allow(unused_imports)]
+use alloc::{rc::Rc, string::ToString, vec::Vec};
-use alloc::prelude::v1::*;
-use alloc::rc::Rc;
 use core::{
     cell::{Cell, RefCell},
     cmp, fmt,

src/memory/vec_bytebuf.rs

@@ -1,6 +1,6 @@
 //! An implementation of `ByteBuf` based on a plain `Vec`.
 
-use alloc::prelude::v1::*;
+use alloc::vec::Vec;
 
 pub struct ByteBuf {
     buf: Vec<u8>,

src/module.rs

@@ -1,6 +1,9 @@
-#[allow(unused_imports)]
+use alloc::{
-use alloc::prelude::v1::*;
+    borrow::ToOwned,
-use alloc::rc::Rc;
+    rc::Rc,
+    string::{String, ToString},
+    vec::Vec,
+};
 use core::cell::RefCell;
 use core::fmt;
 use Trap;

src/nan_preserving_float.rs

@@ -1,8 +1,5 @@
 #![allow(missing_docs)]
 
-#[cfg(not(feature = "std"))]
-use libm::{F32Ext, F64Ext};
-
 use core::cmp::{Ordering, PartialEq, PartialOrd};
 use core::ops::{Add, Div, Mul, Neg, Rem, Sub};
 

src/prepare/compile.rs

@@ -1,5 +1,4 @@
-#[allow(unused_imports)]
+use alloc::{string::String, vec::Vec};
-use alloc::prelude::v1::*;
 
 use parity_wasm::elements::{BlockType, FuncBody, Instruction};
 

src/prepare/mod.rs

@@ -1,5 +1,4 @@
-#[allow(unused_imports)]
+use alloc::vec::Vec;
-use alloc::prelude::v1::*;
 
 use crate::{
     isa,

src/runner.rs

@@ -1,5 +1,4 @@
-#[allow(unused_imports)]
+use alloc::{boxed::Box, vec::Vec};
-use alloc::prelude::v1::*;
 use core::fmt;
 use core::ops;
 use core::{u32, usize};

src/table.rs

@@ -1,6 +1,4 @@
-#[allow(unused_imports)]
+use alloc::{rc::Rc, vec::Vec};
-use alloc::prelude::v1::*;
-use alloc::rc::Rc;
 use core::cell::RefCell;
 use core::fmt;
 use core::u32;

validation/src/context.rs

@@ -1,6 +1,5 @@
 use crate::Error;
-#[allow(unused_imports)]
+use alloc::vec::Vec;
-use alloc::prelude::v1::*;
 use parity_wasm::elements::{
     BlockType, FunctionType, GlobalType, MemoryType, TableType, ValueType,
 };

validation/src/func.rs

@@ -1,6 +1,3 @@
-#[allow(unused_imports)]
-use alloc::prelude::v1::*;
-
 use crate::{
     context::ModuleContext, stack::StackWithLimit, util::Locals, Error, FuncValidator,
     DEFAULT_MEMORY_INDEX, DEFAULT_TABLE_INDEX,

validation/src/lib.rs

@@ -2,8 +2,6 @@
 // #![warn(missing_docs)]
 
 #![cfg_attr(not(feature = "std"), no_std)]
-//// alloc is required in no_std
-#![cfg_attr(not(feature = "std"), feature(alloc, alloc_prelude))]
 
 #[cfg(not(feature = "std"))]
 #[macro_use]
@@ -21,8 +19,7 @@ pub const DEFAULT_TABLE_INDEX: u32 = 0;
 /// Maximal number of pages that a wasm instance supports.
 pub const LINEAR_MEMORY_MAX_PAGES: u32 = 65536;
 
-#[allow(unused_imports)]
+use alloc::{string::String, vec::Vec};
-use alloc::prelude::v1::*;
 use core::fmt;
 #[cfg(feature = "std")]
 use std::error;

validation/src/stack.rs

@@ -1,5 +1,4 @@
-#[allow(unused_imports)]
+use alloc::{string::String, vec::Vec};
-use alloc::prelude::v1::*;
 
 use core::fmt;
 #[cfg(feature = "std")]

validation/src/util.rs

@@ -1,6 +1,5 @@
 use crate::Error;
-#[allow(unused_imports)]
+use alloc::string::String;
-use alloc::prelude::v1::*;
 use parity_wasm::elements::{Local, ValueType};
 
 #[cfg(test)]