Unify pwasm-utils and pwasm-utils-cli packet

src/build.rs

@@ -1,4 +1,3 @@
-use std;
 use super::{
 	optimize,
 	pack_instance,
@@ -10,7 +9,6 @@ use super::{
 	OptimizerError,
 	TargetRuntime,
 };
-use parity_wasm;
 use parity_wasm::elements;
 
 #[derive(Debug)]

src/ext.rs

@@ -3,9 +3,10 @@ use std::vec::Vec;
 use std::borrow::ToOwned;
 
 use parity_wasm::{elements, builder};
-use optimizer::{import_section, export_section};
 use byteorder::{LittleEndian, ByteOrder};
 
+use crate::optimizer::{import_section, export_section};
+
 type Insertion = (usize, u32, u32, String);
 
 pub fn update_call_index(instructions: &mut elements::Instructions, original_imports: usize, inserts: &[Insertion]) {

src/gas/mod.rs

@@ -12,7 +12,7 @@ use std::mem;
 use std::vec::Vec;
 
 use parity_wasm::{elements, builder};
-use rules::Rules;
+use crate::rules::Rules;
 
 pub fn update_call_index(instructions: &mut elements::Instructions, inserted_index: u32) {
 	use parity_wasm::elements::Instruction::*;
@@ -518,7 +518,7 @@ mod tests {
 	use parity_wasm::{serialize, builder, elements};
 	use parity_wasm::elements::Instruction::*;
 	use super::*;
-	use rules;
+	use crate::rules;
 
 	pub fn get_function_body(module: &elements::Module, index: usize)
 		-> Option<&[elements::Instruction]>

src/gas/validation.rs

@@ -9,8 +9,8 @@
 //! the worst case.
 
 use super::MeteredBlock;
-use rules::Set as RuleSet;
-use rules::Rules;
+use crate::rules::Set as RuleSet;
+use crate::rules::Rules;
 use parity_wasm::elements::{FuncBody, Instruction};
 
 use std::collections::HashMap;

src/lib.rs

@@ -25,6 +25,8 @@ mod ref_list;
 mod symbols;
 #[cfg(feature = "std")]
 mod export_globals;
+#[cfg(feature = "cli")]
+pub mod logger;
 
 pub mod stack_height;
 

src/logger.rs

@@ -0,0 +1,24 @@
+use std::env;
+use log::LevelFilter;
+use env_logger::Builder;
+use lazy_static::lazy_static;
+
+lazy_static! {
+	static ref LOG_DUMMY: bool = {
+		let mut builder = Builder::new();
+		builder.filter(None, LevelFilter::Info);
+
+		if let Ok(log) = env::var("RUST_LOG") {
+			builder.parse(&log);
+		}
+
+		builder.init();
+		trace!("logger initialized");
+		true
+	};
+}
+
+/// Intialize log with default settings
+pub fn init() {
+	let _ = *LOG_DUMMY;
+}

src/optimizer.rs

@@ -7,7 +7,7 @@ use std::mem;
 
 use parity_wasm::elements;
 
-use symbols::{Symbol, expand_symbols, push_code_symbols, resolve_function};
+use crate::symbols::{Symbol, expand_symbols, push_code_symbols, resolve_function};
 
 #[derive(Debug)]
 pub enum Error {