Move change_dir() into CliTestContext

Author: djc

src/test/mock/clitools.rs

@@ -8,6 +8,7 @@ use std::{
     fmt::Debug,
     fs,
     io::{self, Write},
+    mem,
     ops::{Deref, DerefMut},
     path::{Path, PathBuf},
     process::Command,
@@ -398,6 +399,11 @@ impl CliTestContext {
             _self_dist: self_dist_tmp,
         }
     }
+
+    pub fn change_dir(&mut self, path: &Path) -> WorkDirGuard<'_> {
+        let prev = self.config.workdir.replace(path.to_owned());
+        WorkDirGuard { inner: self, prev }
+    }
 }
 
 #[must_use]
@@ -425,6 +431,32 @@ impl From<Scenario> for CliTestContext {
     }
 }
 
+#[must_use]
+pub struct WorkDirGuard<'a> {
+    inner: &'a mut CliTestContext,
+    prev: PathBuf,
+}
+
+impl Deref for WorkDirGuard<'_> {
+    type Target = CliTestContext;
+
+    fn deref(&self) -> &Self::Target {
+        &*self.inner
+    }
+}
+
+impl DerefMut for WorkDirGuard<'_> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.inner
+    }
+}
+
+impl Drop for WorkDirGuard<'_> {
+    fn drop(&mut self) {
+        self.inner.config.workdir.replace(mem::take(&mut self.prev));
+    }
+}
+
 #[must_use]
 pub struct DistDirGuard<'a> {
     inner: &'a mut CliTestContext,
@@ -482,12 +514,6 @@ impl Config {
         self.workdir.borrow().clone()
     }
 
-    pub fn change_dir(&mut self, path: &Path, f: &dyn Fn(&mut Config)) {
-        let prev = self.workdir.replace(path.to_owned());
-        f(self);
-        *self.workdir.borrow_mut() = prev;
-    }
-
     pub fn create_rustup_sh_metadata(&self) {
         let rustup_dir = self.homedir.join(".rustup");
         fs::create_dir_all(&rustup_dir).unwrap();

tests/suite/cli_exact.rs

@@ -337,9 +337,13 @@ fn remove_override_with_path() {
             .prefix("rustup-test")
             .tempdir()
             .unwrap();
-        cx.config.change_dir(dir.path(), &|config| {
-            config.expect_ok(&["rustup", "override", "add", "nightly"]);
-        });
+
+        {
+            let mut cx = cx.change_dir(dir.path());
+            cx.config
+                .expect_ok(&["rustup", "override", "add", "nightly"]);
+        }
+
         cx.config.expect_ok_ex(
             &[
                 "rustup",
@@ -367,9 +371,9 @@ fn remove_override_with_path_deleted() {
                 .tempdir()
                 .unwrap();
             let path = std::fs::canonicalize(dir.path()).unwrap();
-            cx.config.change_dir(&path, &|config| {
-                config.expect_ok(&["rustup", "override", "add", "nightly"]);
-            });
+            let mut cx = cx.change_dir(&path);
+            cx.config
+                .expect_ok(&["rustup", "override", "add", "nightly"]);
             path
         };
         cx.config.expect_ok_ex(
@@ -400,9 +404,9 @@ fn remove_override_nonexistent() {
                 .tempdir()
                 .unwrap();
             let path = std::fs::canonicalize(dir.path()).unwrap();
-            cx.config.change_dir(&path, &|config| {
-                config.expect_ok(&["rustup", "override", "add", "nightly"]);
-            });
+            let mut cx = cx.change_dir(&path);
+            cx.config
+                .expect_ok(&["rustup", "override", "add", "nightly"]);
             path
         };
         // FIXME TempDir seems to succumb to difficulties removing dirs on windows
@@ -453,9 +457,9 @@ fn list_overrides_with_nonexistent() {
             .prefix("rustup-test")
             .tempdir()
             .unwrap();
-        cx.config.change_dir(dir.path(), &|config| {
-            config.expect_ok(&["rustup", "override", "add", "nightly"]);
-        });
+        let mut cx = cx.change_dir(dir.path());
+        cx.config
+            .expect_ok(&["rustup", "override", "add", "nightly"]);
         std::fs::canonicalize(dir.path()).unwrap()
     };
     // FIXME TempDir seems to succumb to difficulties removing dirs on windows

tests/suite/cli_rustup.rs

@@ -961,11 +961,11 @@ fn show_toolchain_version_nested_file_override() {
     let subdir = cwd.join("foo");
 
     fs::create_dir_all(&subdir).unwrap();
-    cx.config.change_dir(&subdir, &|config| {
-        config.expect_ok_ex(
-            &["rustup", "show"],
-            &format!(
-                r"Default host: {0}
+    let mut cx = cx.change_dir(&subdir);
+    cx.config.expect_ok_ex(
+        &["rustup", "show"],
+        &format!(
+            r"Default host: {0}
 
 installed toolchains
 --------------------
@@ -980,12 +980,11 @@ nightly-{0} (overridden by '{1}')
 1.3.0 (hash-nightly-2)
 
 ",
-                this_host_triple(),
-                toolchain_file.display()
-            ),
-            r"",
-        );
-    });
+            this_host_triple(),
+            toolchain_file.display()
+        ),
+        r"",
+    );
 }
 
 #[test]
@@ -1039,17 +1038,24 @@ fn override_set_unset_with_path() {
     }
 
     let emptydir = tempfile::tempdir().unwrap();
-    cx.config.change_dir(emptydir.path(), &|config| {
-        config.expect_ok(&["rustup", "override", "set", "nightly", "--path", cwd_str]);
-    });
+    {
+        let mut cx = cx.change_dir(emptydir.path());
+        cx.config
+            .expect_ok(&["rustup", "override", "set", "nightly", "--path", cwd_str]);
+    }
+
     cx.config.expect_ok_ex(
         &["rustup", "override", "list"],
         &format!("{}\tnightly-{}\n", cwd_str, this_host_triple()),
         r"",
     );
-    cx.config.change_dir(emptydir.path(), &|config| {
-        config.expect_ok(&["rustup", "override", "unset", "--path", cwd_str]);
-    });
+
+    {
+        let mut cx = cx.change_dir(emptydir.path());
+        cx.config
+            .expect_ok(&["rustup", "override", "unset", "--path", cwd_str]);
+    }
+
     cx.config
         .expect_ok_ex(&["rustup", "override", "list"], "no overrides\n", r"");
 }
@@ -1728,9 +1734,10 @@ fn file_override_path_relative_not_supported() {
     // Change into an ephemeral dir so that we test that the path is relative to the override
     let ephemeral = cx.config.current_dir().join("ephemeral");
     fs::create_dir_all(&ephemeral).unwrap();
-    cx.config.change_dir(&ephemeral, &|config| {
-        config.expect_err(&["rustc", "--version"], "relative path toolchain");
-    });
+
+    let cx = cx.change_dir(&ephemeral);
+    cx.config
+        .expect_err(&["rustc", "--version"], "relative path toolchain");
 }
 
 #[test]
@@ -1815,9 +1822,9 @@ fn file_override_subdir() {
 
     let subdir = cwd.join("subdir");
     fs::create_dir_all(&subdir).unwrap();
-    cx.config.change_dir(&subdir, &|config| {
-        config.expect_stdout_ok(&["rustc", "--version"], "hash-nightly-2");
-    });
+    let cx = cx.change_dir(&subdir);
+    cx.config
+        .expect_stdout_ok(&["rustc", "--version"], "hash-nightly-2");
 }
 
 #[test]
@@ -2026,9 +2033,9 @@ fn close_file_override_beats_far_directory_override() {
     let toolchain_file = subdir.join("rust-toolchain");
     raw::write_file(&toolchain_file, "nightly").unwrap();
 
-    cx.config.change_dir(&subdir, &|config| {
-        config.expect_stdout_ok(&["rustc", "--version"], "hash-nightly-2");
-    });
+    let cx = cx.change_dir(&subdir);
+    cx.config
+        .expect_stdout_ok(&["rustc", "--version"], "hash-nightly-2");
 }
 
 #[test]