Merge branch 'master' into avery/fix-dev-errors

cloudflare · May 7, 2020 · e4d530e · e4d530e
2 parents 02a42ea + ead7078
commit e4d530e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/util.rs → ...mands/build/wranglerjs/guarded_command.rs b/src/util.rs → ...mands/build/wranglerjs/guarded_command.rs
diff --git a/src/commands/build/wranglerjs/mod.rs b/src/commands/build/wranglerjs/mod.rs
@@ -1,4 +1,5 @@
 mod bundle;
+mod guarded_command;
 pub mod output;
 
 pub use bundle::Bundle;
@@ -25,7 +26,8 @@ use crate::install;
 use crate::settings::toml::Target;
 use crate::terminal::message;
 use crate::upload::package::Package;
-use crate::util;
+
+use guarded_command::GuardedCommand;
 
 // Run the underlying {wranglerjs} executable.
 
@@ -64,7 +66,7 @@ pub fn run_build_and_watch(target: &Target, tx: Option<Sender<()>>) -> Result<()
 
     // Turbofish the result of the closure so we can use ?
     thread::spawn::<_, Result<(), failure::Error>>(move || {
-        let _command_guard = util::GuardedCommand::spawn(command);
+        let _command_guard = GuardedCommand::spawn(command);
 
         let (watcher_tx, watcher_rx) = channel();
         let mut watcher = notify::watcher(watcher_tx, Duration::from_secs(1))?;

diff --git a/src/lib.rs b/src/lib.rs
@@ -9,4 +9,3 @@ pub mod installer;
 pub mod settings;
 pub mod terminal;
 pub mod upload;
-pub mod util;