From 4b916ba5e98edc83ba684e26643515100f6aac95 Mon Sep 17 00:00:00 2001
From: Avery Harnish <averyharnish@gmail.com>
Date: Thu, 7 Nov 2019 14:53:00 -0600
Subject: [PATCH] Change install::install to install

---
 src/commands/build/mod.rs            | 5 +++--
 src/commands/build/watch/mod.rs      | 5 +++--
 src/commands/build/wranglerjs/mod.rs | 5 +++--
 src/commands/generate/mod.rs         | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/commands/build/mod.rs b/src/commands/build/mod.rs
index d5fe334ee..0e6d17678 100644
--- a/src/commands/build/mod.rs
+++ b/src/commands/build/mod.rs
@@ -3,9 +3,10 @@ pub mod wranglerjs;
 mod watch;
 pub use watch::watch_and_build;
 
+use crate::commands;
+use crate::install::install;
 use crate::settings::target::{Target, TargetType};
 use crate::terminal::message;
-use crate::{commands, install};
 
 use std::path::PathBuf;
 use std::process::Command;
@@ -18,7 +19,7 @@ pub fn build(target: &Target) -> Result<(), failure::Error> {
         }
         TargetType::Rust => {
             let tool_name = "wasm-pack";
-            let binary_path = install::install(tool_name, "rustwasm")?.binary(tool_name)?;
+            let binary_path = install(tool_name, "rustwasm")?.binary(tool_name)?;
             let args = ["build", "--target", "no-modules"];
 
             let command = command(&args, &binary_path);
diff --git a/src/commands/build/watch/mod.rs b/src/commands/build/watch/mod.rs
index c30fe05d0..ebe2325ae 100644
--- a/src/commands/build/watch/mod.rs
+++ b/src/commands/build/watch/mod.rs
@@ -3,10 +3,11 @@ use ignore::overrides::OverrideBuilder;
 use ignore::WalkBuilder;
 pub use watcher::wait_for_changes;
 
+use crate::commands;
 use crate::commands::build::{command, wranglerjs};
+use crate::install::install;
 use crate::settings::target::{Target, TargetType};
 use crate::terminal::message;
-use crate::{commands, install};
 
 use notify::{self, RecursiveMode, Watcher};
 use std::sync::mpsc;
@@ -52,7 +53,7 @@ pub fn watch_and_build(
         }
         TargetType::Rust => {
             let tool_name = "wasm-pack";
-            let binary_path = install::install(tool_name, "rustwasm")?.binary(tool_name)?;
+            let binary_path = install(tool_name, "rustwasm")?.binary(tool_name)?;
             let args = ["build", "--target", "no-modules"];
 
             thread::spawn(move || {
diff --git a/src/commands/build/wranglerjs/mod.rs b/src/commands/build/wranglerjs/mod.rs
index 6446ca84d..8c9478434 100644
--- a/src/commands/build/wranglerjs/mod.rs
+++ b/src/commands/build/wranglerjs/mod.rs
@@ -7,6 +7,7 @@ use crate::commands::generate::run_generate;
 
 use crate::commands::publish::package::Package;
 use crate::install;
+use crate::install::{install, install_artifact};
 use crate::util;
 pub use bundle::Bundle;
 use fs2::FileExt;
@@ -162,7 +163,7 @@ fn setup_build(target: &Target) -> Result<(Command, PathBuf, Bundle), failure::E
         // https://github.com/wasm-tool/wasm-pack-plugin/blob/caca20df84782223f002735a8a2e99b2291f957c/plugin.js#L13
         let tool_name = "wasm-pack";
         let author = "rustwasm";
-        let wasm_pack_path = install::install(tool_name, author)?.binary(tool_name)?;
+        let wasm_pack_path = install(tool_name, author)?.binary(tool_name)?;
         command.env("WASM_PACK_PATH", wasm_pack_path);
     }
 
@@ -324,7 +325,7 @@ fn install_wranglerjs() -> Result<PathBuf, failure::Error> {
         let tool_name = "wranglerjs";
         let author = "cloudflare";
         let version = env!("CARGO_PKG_VERSION");
-        let wranglerjs_path = install::install_artifact(tool_name, author, version)?;
+        let wranglerjs_path = install_artifact(tool_name, author, version)?;
         info!("wranglerjs downloaded at: {:?}", wranglerjs_path.path());
         wranglerjs_path.path()
     };
diff --git a/src/commands/generate/mod.rs b/src/commands/generate/mod.rs
index 38bc6dbc0..6392e3f7d 100644
--- a/src/commands/generate/mod.rs
+++ b/src/commands/generate/mod.rs
@@ -1,9 +1,10 @@
 use std::path::PathBuf;
 use std::process::Command;
 
+use crate::commands;
 use crate::commands::validate_worker_name;
+use crate::install::install;
 use crate::settings::target::{Manifest, Site, TargetType};
-use crate::{commands, install};
 
 pub fn generate(
     name: &str,
@@ -28,7 +29,7 @@ pub fn generate(
 
 pub fn run_generate(name: &str, template: &str) -> Result<(), failure::Error> {
     let tool_name = "cargo-generate";
-    let binary_path = install::install(tool_name, "ashleygwilliams")?.binary(tool_name)?;
+    let binary_path = install(tool_name, "ashleygwilliams")?.binary(tool_name)?;
 
     let args = ["generate", "--git", template, "--name", name, "--force"];