Transition to Rust 2018 style imports

src/gas/mod.rs

@@ -512,9 +512,6 @@ pub fn inject_gas_counter<R: Rules>(
 
 #[cfg(test)]
 mod tests {
-
-	extern crate wabt;
-
 	use parity_wasm::{serialize, builder, elements};
 	use parity_wasm::elements::Instruction::*;
 	use super::*;
@@ -578,7 +575,7 @@ mod tests {
 		);
 
 		let binary = serialize(injected_module).expect("serialization failed");
-		self::wabt::wasm2wat(&binary).unwrap();
+		wabt::wasm2wat(&binary).unwrap();
 	}
 
 	#[test]
@@ -617,7 +614,7 @@ mod tests {
 		assert_eq!(injected_module.functions_space(), 2);
 
 		let binary = serialize(injected_module).expect("serialization failed");
-		self::wabt::wasm2wat(&binary).unwrap();
+		wabt::wasm2wat(&binary).unwrap();
 	}
 
 	#[test]

src/graph.rs

@@ -771,10 +771,8 @@ pub fn generate(f: &Module) -> Result<Vec<u8>, Error> {
 
 #[cfg(test)]
 mod tests {
-
-	extern crate wabt;
-
 	use parity_wasm::elements;
+	use indoc::indoc;
 
 	fn load_sample(wat: &'static str) -> super::Module {
 		super::parse(&wabt::wat2wasm(wat).expect("faled to parse wat!")[..])

src/lib.rs

@@ -4,14 +4,6 @@
 #[macro_use]
 extern crate alloc;
 
-extern crate byteorder;
-extern crate parity_wasm;
-#[macro_use] extern crate log;
-#[cfg(test)] #[macro_use] extern crate indoc;
-#[cfg(test)] extern crate rand;
-#[cfg(test)] extern crate binaryen;
-
-
 pub mod rules;
 
 mod build;
@@ -43,6 +35,7 @@ pub use ref_list::{RefList, Entry, EntryRef, DeleteTransaction};
 #[cfg(feature = "std")]
 pub use export_globals::export_mutable_globals;
 pub use parity_wasm::elements::Instruction;
+use parity_wasm;
 
 pub struct TargetSymbols {
 	pub create: &'static str,

src/logger.rs

@@ -1,4 +1,4 @@
-use log::LevelFilter;
+use log::{LevelFilter, trace};
 use env_logger::Builder;
 use lazy_static::lazy_static;
 

src/optimizer.rs

@@ -5,8 +5,8 @@ use crate::std::collections::{BTreeSet as Set};
 use crate::std::vec::Vec;
 use crate::std::mem;
 
+use log::trace;
 use parity_wasm::elements;
-
 use crate::symbols::{Symbol, expand_symbols, push_code_symbols, resolve_function};
 
 #[derive(Debug)]

src/pack.rs

@@ -218,8 +218,6 @@ pub fn pack_instance(raw_module: Vec<u8>, mut ctor_module: elements::Module, tar
 
 #[cfg(test)]
 mod test {
-	extern crate parity_wasm;
-
 	use parity_wasm::builder;
 	use super::*;
 	use super::super::optimize;

src/stack_height/max_height.rs

@@ -1,5 +1,6 @@
 use crate::std::vec::Vec;
 
+use log::trace;
 use parity_wasm::elements::{self, BlockType, Type};
 use super::{resolve_func_type, Error};
 
@@ -428,7 +429,6 @@ pub(crate) fn compute(func_idx: u32, module: &elements::Module) -> Result<u32, E
 
 #[cfg(test)]
 mod tests {
-	extern crate wabt;
 	use parity_wasm::elements;
 	use super::*;
 

src/stack_height/mod.rs

@@ -374,7 +374,6 @@ fn resolve_func_type(
 
 #[cfg(test)]
 mod tests {
-	extern crate wabt;
 	use parity_wasm::elements;
 	use super::*;
 

src/symbols.rs

@@ -4,6 +4,7 @@ use crate::std::collections::{HashSet as Set};
 use crate::std::collections::{BTreeSet as Set};
 use crate::std::vec::Vec;
 
+use log::trace;
 use parity_wasm::elements;
 
 #[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Copy, Clone, Debug)]