diff --git a/Cargo.lock b/Cargo.lock index ed8b708..8b5c16c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,20 +67,6 @@ dependencies = [ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "binary-install" -version = "0.1.0" -dependencies = [ - "curl 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)", - "zip 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "bitflags" version = "1.0.4" @@ -1059,7 +1045,6 @@ name = "wasm-pack" version = "0.5.1" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "binary-install 0.1.0", "cargo_metadata 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1077,9 +1062,24 @@ dependencies = [ "structopt 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-pack-binary-install 0.1.0", "which 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "wasm-pack-binary-install" +version = "0.1.0" +dependencies = [ + "curl 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tar 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)", + "zip 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "which" version = "2.0.0" diff --git a/Cargo.toml b/Cargo.toml index f3d1659..dd1b560 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ slog-async = "2.3" structopt = "0.2" toml = "0.4" which = "2.0.0" -binary-install = { version = "0.1.0", path = "./binary-install" } +wasm-pack-binary-install = { version = "0.1.0", path = "./binary-install" } [dev-dependencies] tempfile = "3" diff --git a/binary-install/Cargo.toml b/binary-install/Cargo.toml index c78b0dd..acdd991 100644 --- a/binary-install/Cargo.toml +++ b/binary-install/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "binary-install" +name = "wasm-pack-binary-install" version = "0.1.0" [dependencies] diff --git a/src/bindgen.rs b/src/bindgen.rs index 6b8b1e7..15be7ec 100644 --- a/src/bindgen.rs +++ b/src/bindgen.rs @@ -1,6 +1,5 @@ //! Functionality related to installing and running `wasm-bindgen`. -use binary_install::{Cache, Download}; use child; use emoji; use failure::{self, ResultExt}; @@ -11,6 +10,7 @@ use std::fs; use std::path::{Path, PathBuf}; use std::process::Command; use target; +use wasm_pack_binary_install::{Cache, Download}; use which::which; use PBAR; diff --git a/src/command/build.rs b/src/command/build.rs index 123e043..7852d8a 100644 --- a/src/command/build.rs +++ b/src/command/build.rs @@ -1,6 +1,5 @@ //! Implementation of the `wasm-pack build` command. -use binary_install::{Cache, Download}; use bindgen; use build; use command::utils::{create_pkg_dir, set_crate_path}; @@ -15,6 +14,7 @@ use slog::Logger; use std::path::PathBuf; use std::str::FromStr; use std::time::Instant; +use wasm_pack_binary_install::{Cache, Download}; use PBAR; /// Everything required to configure and run the `wasm-pack init` command. diff --git a/src/command/test.rs b/src/command/test.rs index 5a434e9..bd8d77a 100644 --- a/src/command/test.rs +++ b/src/command/test.rs @@ -1,7 +1,6 @@ //! Implementation of the `wasm-pack test` command. use super::build::BuildMode; -use binary_install::Cache; use bindgen; use build; use command::utils::set_crate_path; @@ -16,6 +15,7 @@ use slog::Logger; use std::path::PathBuf; use std::time::Instant; use test::{self, webdriver}; +use wasm_pack_binary_install::Cache; use PBAR; #[derive(Debug, Default, StructOpt)] diff --git a/src/lib.rs b/src/lib.rs index 2d6d296..d7c641b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,10 +18,10 @@ extern crate serde_json; extern crate structopt; #[macro_use] extern crate slog; -extern crate binary_install; extern crate slog_async; extern crate slog_term; extern crate toml; +extern crate wasm_pack_binary_install; pub mod bindgen; pub mod build; diff --git a/src/test/webdriver.rs b/src/test/webdriver.rs index 9fc3c56..9709c40 100644 --- a/src/test/webdriver.rs +++ b/src/test/webdriver.rs @@ -1,10 +1,10 @@ //! Getting WebDriver client binaries. -use binary_install::Cache; use command::build::BuildMode; use failure; use std::path::PathBuf; use target; +use wasm_pack_binary_install::Cache; /// Get the path to an existing `chromedriver`, or install it if no existing /// binary is found. diff --git a/tests/all/bindgen.rs b/tests/all/bindgen.rs index 032d48b..5f6b481 100644 --- a/tests/all/bindgen.rs +++ b/tests/all/bindgen.rs @@ -1,6 +1,6 @@ -use binary_install::Cache; use tempfile; use wasm_pack::bindgen; +use wasm_pack_binary_install::Cache; #[test] #[cfg(any( diff --git a/tests/all/main.rs b/tests/all/main.rs index c41b090..c79c4f1 100644 --- a/tests/all/main.rs +++ b/tests/all/main.rs @@ -6,10 +6,10 @@ extern crate serde_derive; extern crate serde_json; #[macro_use] extern crate slog; -extern crate binary_install; extern crate structopt; extern crate tempfile; extern crate wasm_pack; +extern crate wasm_pack_binary_install; mod bindgen; mod build; diff --git a/tests/all/utils/fixture.rs b/tests/all/utils/fixture.rs index 7c4dfe4..b361865 100644 --- a/tests/all/utils/fixture.rs +++ b/tests/all/utils/fixture.rs @@ -1,5 +1,4 @@ use super::logger::null_logger; -use binary_install::Cache; use std::env; use std::fs; use std::mem::ManuallyDrop; @@ -9,6 +8,7 @@ use std::sync::{MutexGuard, Once, ONCE_INIT}; use std::thread; use tempfile::TempDir; use wasm_pack; +use wasm_pack_binary_install::Cache; /// A test fixture in a temporary directory. pub struct Fixture { diff --git a/tests/all/webdriver.rs b/tests/all/webdriver.rs index d5e8cf6..c0bbaa5 100644 --- a/tests/all/webdriver.rs +++ b/tests/all/webdriver.rs @@ -1,6 +1,6 @@ -use binary_install::Cache; use utils::fixture; use wasm_pack::test::webdriver; +use wasm_pack_binary_install::Cache; #[test] #[cfg(any(