Transition to Rust 2018 style imports

cli/build/main.rs

@@ -1,20 +1,14 @@
 //! Experimental build tool for cargo
 
-#[macro_use]
-extern crate clap;
-extern crate glob;
-extern crate pwasm_utils as utils;
-extern crate parity_wasm;
-use pwasm_utils::logger;
+use pwasm_utils::{build, BuildError, SourceTarget, TargetRuntime, logger};
 
 mod source;
 
 use std::{fs, io};
 use std::path::PathBuf;
 
-use clap::{App, Arg};
+use clap::{App, Arg, crate_version};
 use parity_wasm::elements;
-use utils::{build, BuildError, SourceTarget, TargetRuntime};
 
 #[derive(Debug)]
 pub enum Error {
@@ -210,9 +204,7 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
-	extern crate tempdir;
-
-	use self::tempdir::TempDir;
+	use tempdir::TempDir;
 	use std::fs;
 
 	use super::process_output;

cli/build/source.rs

@@ -3,7 +3,7 @@
 pub const UNKNOWN_TRIPLET: &str = "wasm32-unknown-unknown";
 pub const EMSCRIPTEN_TRIPLET: &str = "wasm32-unknown-emscripten";
 
-use utils::SourceTarget;
+use pwasm_utils::SourceTarget;
 
 /// Configuration of previous build step (cargo compilation)
 #[derive(Debug)]

cli/check/main.rs

@@ -1,8 +1,4 @@
-extern crate parity_wasm;
-extern crate pwasm_utils as utils;
 use pwasm_utils::logger;
-extern crate clap;
-
 use clap::{App, Arg};
 use parity_wasm::elements;
 

cli/ext/main.rs

@@ -1,20 +1,13 @@
-extern crate parity_wasm;
-extern crate pwasm_utils as utils;
-use pwasm_utils::logger;
-
-use std::env;
-
 fn main() {
+	pwasm_utils::logger::init();
 
-	logger::init();
-
-	let args = env::args().collect::<Vec<_>>();
+	let args = std::env::args().collect::<Vec<_>>();
 	if args.len() != 3 {
 		println!("Usage: {} input_file.wasm output_file.wasm", args[0]);
 		return;
 	}
 
-	let module = utils::externalize(
+	let module = pwasm_utils::externalize(
 		parity_wasm::deserialize_file(&args[1]).expect("Module to deserialize ok"),
 		vec!["_free", "_malloc", "_memcpy", "_memset", "_memmove"],
 	);

cli/gas/main.rs

@@ -1,7 +1,4 @@
-extern crate parity_wasm;
-extern crate pwasm_utils as utils;
-use pwasm_utils::logger;
-
+use pwasm_utils::{self as utils, logger};
 use std::env;
 
 fn main() {

cli/pack/main.rs

@@ -1,8 +1,4 @@
-extern crate parity_wasm;
-extern crate pwasm_utils as utils;
-use pwasm_utils::logger;
-extern crate clap;
-
+use pwasm_utils::{self as utils, logger};
 use clap::{App, Arg};
 
 fn main() {

cli/prune/main.rs

@@ -1,8 +1,4 @@
-extern crate parity_wasm;
-extern crate pwasm_utils as utils;
-use pwasm_utils::logger;
-extern crate clap;
-
+use pwasm_utils::{self as utils, logger};
 use clap::{App, Arg};
 
 fn main() {

cli/stack_height/main.rs

@@ -1,9 +1,5 @@
-extern crate pwasm_utils as utils;
-extern crate parity_wasm;
-use pwasm_utils::logger;
-
+use pwasm_utils::{logger, stack_height};
 use std::env;
-use utils::stack_height;
 
 fn main() {
 	logger::init();