From 1287e84086606b4140ee4bcade33795a6cca7627 Mon Sep 17 00:00:00 2001
From: huangjj27 <huangjj.27@qq.com>
Date: Sat, 20 Oct 2018 23:42:22 +0800
Subject: [PATCH] update: rebasing to master

fixes conflicts encountered when rebasing to master

fixes # 390
---
 src/bindgen.rs     | 1 -
 tests/all/build.rs | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bindgen.rs b/src/bindgen.rs
index 8dc67eabf..296e4ab38 100644
--- a/src/bindgen.rs
+++ b/src/bindgen.rs
@@ -8,7 +8,6 @@ use error::Error;
 use failure::{self, ResultExt};
 use progressbar::Step;
 use slog::Logger;
-use std::env;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 use target;
diff --git a/tests/all/build.rs b/tests/all/build.rs
index 8611bf91e..30ea9ad1a 100644
--- a/tests/all/build.rs
+++ b/tests/all/build.rs
@@ -47,6 +47,8 @@ fn it_format_out_dir_on_windows() {
         &fixture.path.display().to_string(),
     ])
     .unwrap();
+
+    let logger = logger::new(&cli.cmd, 3).unwrap();
     let result = command::run_wasm_pack(cli.cmd, &logger);
     assert!(result.is_ok(), "js_hello_world example should pass");