Fix build on Windows

Author: rbtcollins

tests/cli-paths.rs

@@ -354,7 +354,7 @@ mod windows {
     use rustup::test::{get_path, with_saved_path};
 
     use super::INIT_NONE;
-    use crate::mock::clitools::{self, expect_ok, Scenario};
+    use crate::mock::clitools::{self, Scenario};
 
     #[test]
     /// Smoke test for end-to-end code connectivity of the installer path mgmt on windows.

tests/cli-rustup.rs

@@ -1919,7 +1919,7 @@ fn non_utf8_arg() {
 
     setup(&|config| {
         config.expect_ok(&["rustup", "default", "nightly"]);
-        let out = self.run(
+        let out = config.run(
             "rustc",
             &[
                 OsString::from("--echo-args".to_string()),
@@ -1957,7 +1957,7 @@ fn non_utf8_toolchain() {
 
     setup(&|config| {
         config.expect_ok(&["rustup", "default", "nightly"]);
-        let out = self.run(
+        let out = config.run(
             "rustc",
             &[OsString::from_wide(&[u16::from(b'+'), 0xd801, 0xd801])],
             &[("RUST_BACKTRACE", "1")],