Convert defer! to scopeguard::guard

Captures are being miscompiled, at least on MSVC. Using
scopeguard::guard with explicit argument threading seems to work.

Author: brson

src/multirust-cli/main.rs

@@ -13,7 +13,6 @@ extern crate openssl;
 extern crate itertools;
 extern crate time;
 extern crate rand;
-#[macro_use]
 extern crate scopeguard;
 extern crate tempdir;
 

src/multirust-cli/self_update.rs

@@ -43,6 +43,7 @@ use std::path::{Path, PathBuf};
 use std::process::{self, Command};
 use std::fs;
 use tempdir::TempDir;
+use scopeguard;
 
 // The big installation messages. These are macros because the first
 // argument of format! needs to be a literal.
@@ -475,7 +476,7 @@ fn delete_multirust_and_cargo_home() -> Result<()> {
             return Err(Error::WindowsUninstallMadness(err));
         }
 
-        defer!{{ let _ = CloseHandle(gc_handle); }}
+        let _g = scopeguard::guard(gc_handle, |h| { let _ = CloseHandle(*h); });
 
         try!(Command::new(gc_exe).spawn()
              .map_err(|e| Error::WindowsUninstallMadness(e)));
@@ -537,7 +538,7 @@ fn wait_for_parent() -> Result<()> {
             return Err(Error::WindowsUninstallMadness(err));
         }
 
-        defer! {{ let _ = CloseHandle(snapshot); }}
+        let _g = scopeguard::guard(snapshot, |h| { let _ = CloseHandle(*h); });
 
         let mut entry: PROCESSENTRY32 = mem::zeroed();
         entry.dwSize = mem::size_of::<PROCESSENTRY32>() as DWORD;
@@ -570,7 +571,7 @@ fn wait_for_parent() -> Result<()> {
             return Ok(());
         }
 
-        defer! {{ let _ = CloseHandle(parent); }}
+        let _g = scopeguard::guard(parent, |h| { let _ = CloseHandle(*h); });
 
         // Wait for our parent to exit
         let res = WaitForSingleObject(parent, INFINITE);

src/multirust-mock/src/clitools.rs

@@ -14,6 +14,7 @@ use dist::{MockDistServer, MockChannel, MockPackage,
            MockTargettedPackage, MockComponent, change_channel_date,
            ManifestVersion};
 use hyper::Url;
+use scopeguard;
 
 /// The configuration used by the tests in this module
 pub struct Config {
@@ -232,9 +233,7 @@ pub fn run(config: &Config, name: &str, args: &[&str], env: &[(&str, &str)]) ->
 pub fn change_dir(path: &Path, f: &Fn()) {
     let cwd = env::current_dir().unwrap();
     env::set_current_dir(path).unwrap();
-    defer! {
-        env::set_current_dir(&cwd).unwrap()
-    }
+    let _g = scopeguard::guard(cwd, |d| env::set_current_dir(d).unwrap());
     f();
 }
 

src/multirust-mock/src/lib.rs

@@ -3,7 +3,6 @@
 extern crate hyper;
 #[macro_use]
 extern crate lazy_static;
-#[macro_use]
 extern crate scopeguard;
 extern crate walkdir;
 extern crate flate2;

src/multirust-utils/src/lib.rs

@@ -4,7 +4,6 @@
 extern crate hyper;
 extern crate openssl;
 extern crate rand;
-#[macro_use]
 extern crate scopeguard;
 
 #[cfg(windows)]

src/multirust-utils/src/utils.rs

@@ -12,6 +12,7 @@ use errors::{Error, Notification, NotifyHandler};
 use raw;
 #[cfg(windows)]
 use winapi::DWORD;
+use scopeguard;
 
 pub use raw::{is_directory, is_file, path_exists, if_not_empty, random_string, prefix_arg,
                     has_cmd, find_cmd};
@@ -333,7 +334,7 @@ pub fn home_dir() -> Option<PathBuf> {
         if OpenProcessToken(me, TOKEN_READ, &mut token) == 0 {
             return None
         }
-        defer! {{ let _ = CloseHandle(token); }}
+        let _g = scopeguard::guard(token, |h| { let _ = CloseHandle(*h); });
         fill_utf16_buf(|buf, mut sz| {
             match GetUserProfileDirectoryW(token, buf, &mut sz) {
                 0 if GetLastError() != ERROR_INSUFFICIENT_BUFFER => 0,

tests/cli-self-update.rs

@@ -5,7 +5,6 @@ extern crate multirust_utils;
 #[macro_use]
 extern crate lazy_static;
 extern crate tempdir;
-#[macro_use]
 extern crate scopeguard;
 
 #[cfg(windows)]
@@ -38,8 +37,8 @@ pub fn setup(f: &Fn(&Config)) {
 
         // An windows these tests mess with the user's PATH. Save
         // and restore them here to keep from trashing things.
-        let ref saved_path = get_path();
-        defer! { restore_path(saved_path) }
+        let saved_path = get_path();
+        let _g = scopeguard::guard(saved_path, |p| restore_path(p));
 
         f(config);
     });