From a51413563eeefcd6ec2a254d79e629b11b9f45cb Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Tue, 9 Apr 2019 19:24:45 +0300
Subject: [PATCH] fix nightly and warnings

---
 src/common/stack.rs       | 2 +-
 src/func.rs               | 2 +-
 src/imports.rs            | 2 +-
 src/isa.rs                | 2 +-
 src/lib.rs                | 3 ++-
 src/memory.rs             | 2 +-
 src/module.rs             | 2 +-
 src/runner.rs             | 2 +-
 src/table.rs              | 2 +-
 src/validation/context.rs | 2 +-
 src/validation/func.rs    | 2 +-
 src/validation/mod.rs     | 4 +---
 src/validation/util.rs    | 2 +-
 13 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/common/stack.rs b/src/common/stack.rs
index 85afa62..588a33e 100644
--- a/src/common/stack.rs
+++ b/src/common/stack.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 
 use core::fmt;
 #[cfg(feature = "std")]
diff --git a/src/func.rs b/src/func.rs
index feef452..0a6aa0c 100644
--- a/src/func.rs
+++ b/src/func.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 use crate::alloc::rc::{Rc, Weak};
 use core::fmt;
 use crate::host::Externals;
diff --git a/src/imports.rs b/src/imports.rs
index 4757ab7..97444ac 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 
 #[cfg(not(feature = "std"))]
 use hashbrown::HashMap;
diff --git a/src/isa.rs b/src/isa.rs
index a73dc19..9a062cf 100644
--- a/src/isa.rs
+++ b/src/isa.rs
@@ -68,7 +68,7 @@
 //!
 
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 
 /// Should we keep a value before "discarding" a stack frame?
 ///
diff --git a/src/lib.rs b/src/lib.rs
index 6cbc3e0..bbca7c0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -98,6 +98,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 //// alloc is required in no_std
 #![cfg_attr(not(feature = "std"), feature(alloc))]
+#![cfg_attr(not(feature = "std"), feature(alloc_prelude))]
 
 #[cfg(not(feature = "std"))]
 #[macro_use]
@@ -121,7 +122,7 @@ extern crate memory_units as memory_units_crate;
 extern crate parity_wasm;
 
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 use core::fmt;
 #[cfg(feature = "std")]
 use std::error;
diff --git a/src/memory.rs b/src/memory.rs
index 73a47b9..a7f7061 100644
--- a/src/memory.rs
+++ b/src/memory.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 use crate::alloc::rc::Rc;
 use core::cell::{Cell, RefCell};
 use core::cmp;
diff --git a/src/module.rs b/src/module.rs
index d5afcc1..a99bb35 100644
--- a/src/module.rs
+++ b/src/module.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 use crate::alloc::rc::Rc;
 use core::cell::RefCell;
 use core::fmt;
diff --git a/src/runner.rs b/src/runner.rs
index 9800199..bc16396 100644
--- a/src/runner.rs
+++ b/src/runner.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 use crate::common::{DEFAULT_MEMORY_INDEX, DEFAULT_TABLE_INDEX};
 use core::fmt;
 use core::ops;
diff --git a/src/table.rs b/src/table.rs
index 0005469..288c304 100644
--- a/src/table.rs
+++ b/src/table.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 use crate::alloc::rc::Rc;
 use core::cell::RefCell;
 use core::fmt;
diff --git a/src/validation/context.rs b/src/validation/context.rs
index f928f01..2d97b02 100644
--- a/src/validation/context.rs
+++ b/src/validation/context.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 use parity_wasm::elements::{
     BlockType, FunctionType, GlobalType, MemoryType, TableType, ValueType,
 };
diff --git a/src/validation/func.rs b/src/validation/func.rs
index 4150325..8a20151 100644
--- a/src/validation/func.rs
+++ b/src/validation/func.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 use crate::common::{DEFAULT_MEMORY_INDEX, DEFAULT_TABLE_INDEX};
 use core::u32;
 use parity_wasm::elements::{BlockType, Func, FuncBody, Instruction, TableElementType, ValueType};
diff --git a/src/validation/mod.rs b/src/validation/mod.rs
index f96f154..ee4d377 100644
--- a/src/validation/mod.rs
+++ b/src/validation/mod.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 use core::fmt;
 #[cfg(feature = "std")]
 use std::error;
@@ -150,8 +150,6 @@ pub fn deny_floating_point(module: &Module) -> Result<(), Error> {
     }
 
     if let (Some(sec), Some(types)) = (module.function_section(), module.type_section()) {
-        use parity_wasm::elements::{Type, ValueType};
-
         let types = types.types();
 
         for sig in sec.entries() {
diff --git a/src/validation/util.rs b/src/validation/util.rs
index 06f5b2a..bcbf4a5 100644
--- a/src/validation/util.rs
+++ b/src/validation/util.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-use crate::alloc::prelude::*;
+use crate::alloc::prelude::v1::*;
 use parity_wasm::elements::{Local, ValueType};
 use crate::validation::Error;