expect_ok takes mutable Config

This is sufficient to test immutable dist dirs.

Immutable dist dirs require the ability to run commands with a different
config. One nice way to express that requires a mutable borrow or
unnecessary interior mutability; this patch builds up sufficient mut
borrow capability that we can avoid a borrow checker failure by having
just the one mutable borrow.

Author: rbtcollins

src/cli/self_update/test.rs

@@ -36,7 +36,7 @@ fn restore_path(p: Option<RegValue>) {
 }
 
 /// Support testing of code that mutates global path state
-pub fn with_saved_path(f: &dyn Fn()) {
+pub fn with_saved_path(f: &mut dyn FnMut()) {
     // Lock protects concurrent mutation of registry
     lazy_static! {
         static ref LOCK: Mutex<()> = Mutex::new(());

src/cli/self_update/windows.rs

@@ -745,7 +745,7 @@ mod tests {
     fn windows_path_regkey_type() {
         // per issue #261, setting PATH should use REG_EXPAND_SZ.
         let tp = Box::new(currentprocess::TestProcess::default());
-        with_saved_path(&|| {
+        with_saved_path(&mut || {
             currentprocess::with(tp.clone(), || {
                 let root = RegKey::predef(HKEY_CURRENT_USER);
                 let environment = root
@@ -775,7 +775,7 @@ mod tests {
         // during uninstall the PATH key may end up empty; if so we should
         // delete it.
         let tp = Box::new(currentprocess::TestProcess::default());
-        with_saved_path(&|| {
+        with_saved_path(&mut || {
             currentprocess::with(tp.clone(), || {
                 let root = RegKey::predef(HKEY_CURRENT_USER);
                 let environment = root
@@ -816,7 +816,7 @@ mod tests {
                 .collect(),
             ..Default::default()
         });
-        with_saved_path(&|| {
+        with_saved_path(&mut || {
             currentprocess::with(tp.clone(), || {
                 let root = RegKey::predef(HKEY_CURRENT_USER);
                 let environment = root
@@ -845,7 +845,7 @@ mod tests {
     fn windows_treat_missing_path_as_empty() {
         // during install the PATH key may be missing; treat it as empty
         let tp = Box::new(currentprocess::TestProcess::default());
-        with_saved_path(&|| {
+        with_saved_path(&mut || {
             currentprocess::with(tp.clone(), || {
                 let root = RegKey::predef(HKEY_CURRENT_USER);
                 let environment = root

src/env_var.rs

@@ -56,7 +56,7 @@ mod tests {
             vars,
             ..Default::default()
         });
-        with_saved_path(&|| {
+        with_saved_path(&mut || {
             currentprocess::with(tp.clone(), || {
                 let mut path_entries = vec![];
                 let mut cmd = Command::new("test");

tests/cli-inst-interactive.rs

@@ -53,7 +53,7 @@ fn run_input_with_env(
 #[test]
 fn update() {
     clitools::setup(Scenario::SimpleV2, &|config| {
-        with_saved_path(&|| {
+        with_saved_path(&mut || {
             run_input(config, &["rustup-init"], "\n\n");
             let out = run_input(config, &["rustup-init"], "\n\n");
             assert!(out.ok, "stdout:\n{}\nstderr:\n{}", out.stdout, out.stderr);
@@ -116,7 +116,7 @@ Rust is installed now. Great!
 #[test]
 fn smoke_case_install_with_path_install() {
     clitools::setup(Scenario::SimpleV2, &|config| {
-        with_saved_path(&|| {
+        with_saved_path(&mut || {
             let out = run_input(config, &["rustup-init"], "\n\n");
             assert!(out.ok);
             assert!(!out

tests/cli-paths.rs

@@ -360,7 +360,7 @@ mod windows {
     /// Smoke test for end-to-end code connectivity of the installer path mgmt on windows.
     fn install_uninstall_affect_path() {
         clitools::setup(Scenario::Empty, &|config| {
-            with_saved_path(&|| {
+            with_saved_path(&mut || {
                 let path = format!("{:?}", config.cargodir.join("bin").to_string_lossy());
 
                 config.expect_ok(&INIT_NONE);
@@ -390,7 +390,7 @@ mod windows {
         use winreg::{RegKey, RegValue};
 
         clitools::setup(Scenario::Empty, &|config| {
-            with_saved_path(&|| {
+            with_saved_path(&mut || {
                 // Set up a non unicode PATH
                 let reg_value = RegValue {
                     bytes: vec![

tests/cli-self-upd.rs

@@ -25,7 +25,7 @@ pub fn update_setup(f: &dyn Fn(&mut Config, &Path)) {
 }
 
 /// Empty dist server, rustup installed with no toolchain
-fn setup_empty_installed(f: &dyn Fn(&Config)) {
+fn setup_empty_installed(f: &dyn Fn(&mut Config)) {
     clitools::setup(Scenario::Empty, &|config| {
         config.expect_ok(&[
             "rustup-init",
@@ -39,7 +39,7 @@ fn setup_empty_installed(f: &dyn Fn(&Config)) {
 }
 
 /// SimpleV3 dist server, rustup installed with default toolchain
-fn setup_installed(f: &dyn Fn(&Config)) {
+fn setup_installed(f: &dyn Fn(&mut Config)) {
     clitools::setup(Scenario::SimpleV2, &|config| {
         config.expect_ok(&["rustup-init", "-y", "--no-modify-path"]);
         f(config);
@@ -52,7 +52,7 @@ fn setup_installed(f: &dyn Fn(&Config)) {
 /// status of the proxies.
 fn install_bins_to_cargo_home() {
     clitools::setup(Scenario::SimpleV2, &|config| {
-        with_saved_path(&|| {
+        with_saved_path(&mut || {
             config.expect_ok_contains(
                 &["rustup-init", "-y"],
                 for_host!(
@@ -101,7 +101,7 @@ info: default toolchain set to 'stable-{0}'
 #[test]
 fn install_twice() {
     clitools::setup(Scenario::SimpleV2, &|config| {
-        with_saved_path(&|| {
+        with_saved_path(&mut || {
             config.expect_ok(&["rustup-init", "-y"]);
             config.expect_ok(&["rustup-init", "-y"]);
             let rustup = config.cargodir.join(format!("bin/rustup{EXE_SUFFIX}"));

tests/mock/clitools.rs

@@ -329,7 +329,7 @@ impl Config {
         }
     }
 
-    pub fn expect_ok(&self, args: &[&str]) {
+    pub fn expect_ok(&mut self, args: &[&str]) {
         let out = self.run(args[0], &args[1..], &[]);
         if !out.ok {
             print_command(args, &out);