update: rebasing to master

fixes conflicts encountered when rebasing to master fixes # 390
rustwasm · Oct 20, 2018 · 1287e84 · 1287e84
1 parent f7ce0b6
commit 1287e84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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");