Rename Runner::build to Runner::run and re-introduce Runner::build

Author: regexident

tests/buildtest/mod.rs

@@ -9,7 +9,7 @@ mod inside_docker;
 #[test]
 fn test_hello_world() {
     runner::run("hello-world", |run| {
-        run.build(SandboxBuilder::new().enable_networking(false), |build| {
+        run.run(SandboxBuilder::new().enable_networking(false), |build| {
             let storage = rustwide::logging::LogStorage::new(LevelFilter::Info);
             rustwide::logging::capture(&storage, || -> Result<_, Error> {
                 build.cargo().args(&["run"]).run()?;
@@ -29,7 +29,7 @@ fn test_hello_world() {
 #[test]
 fn test_process_lines() {
     runner::run("process-lines", |run| {
-        run.build(SandboxBuilder::new().enable_networking(false), |build| {
+        run.run(SandboxBuilder::new().enable_networking(false), |build| {
             let storage = rustwide::logging::LogStorage::new(LevelFilter::Info);
             let mut ex = false;
             rustwide::logging::capture(&storage, || -> Result<_, Error> {
@@ -64,7 +64,7 @@ fn test_sandbox_oom() {
     use rustwide::cmd::CommandError;
 
     runner::run("out-of-memory", |run| {
-        let res = run.build(
+        let res = run.run(
             SandboxBuilder::new()
                 .enable_networking(false)
                 .memory_limit(Some(512 * 1024 * 1024)),
@@ -85,7 +85,7 @@ fn test_sandbox_oom() {
 #[test]
 fn test_override_files() {
     runner::run("cargo-config", |run| {
-        run.build(SandboxBuilder::new().enable_networking(false), |build| {
+        run.run(SandboxBuilder::new().enable_networking(false), |build| {
             let storage = rustwide::logging::LogStorage::new(LevelFilter::Info);
             rustwide::logging::capture(&storage, || -> Result<_, Error> {
                 build.cargo().args(&["--version"]).run()?;
@@ -104,7 +104,7 @@ fn test_override_files() {
 #[test]
 fn test_cargo_workspace() {
     runner::run("cargo-workspace", |run| {
-        run.build(SandboxBuilder::new().enable_networking(false), |build| {
+        run.run(SandboxBuilder::new().enable_networking(false), |build| {
             let storage = rustwide::logging::LogStorage::new(LevelFilter::Info);
             rustwide::logging::capture(&storage, || -> Result<_, Error> {
                 build.cargo().args(&["run"]).run()?;

tests/buildtest/runner.rs

@@ -1,5 +1,5 @@
 use failure::Error;
-use rustwide::{cmd::SandboxBuilder, Build, Crate, Toolchain, Workspace};
+use rustwide::{cmd::SandboxBuilder, Build, BuildBuilder, Crate, Toolchain, Workspace};
 use std::path::Path;
 
 pub(crate) fn run(crate_name: &str, f: impl FnOnce(&mut Runner) -> Result<(), Error>) {
@@ -38,11 +38,19 @@ impl Runner {
     pub(crate) fn build<T>(
         &self,
         sandbox: SandboxBuilder,
-        f: impl FnOnce(&Build) -> Result<T, Error>,
+        f: impl FnOnce(BuildBuilder) -> Result<T, Error>,
     ) -> Result<T, Error> {
         let mut dir = self.workspace.build_dir(&self.crate_name);
         dir.purge()?;
-        dir.build(&self.toolchain, &self.krate, sandbox).run(f)
+        f(dir.build(&self.toolchain, &self.krate, sandbox))
+    }
+
+    pub(crate) fn run<T>(
+        &self,
+        sandbox: SandboxBuilder,
+        f: impl FnOnce(&Build) -> Result<T, Error>,
+    ) -> Result<T, Error> {
+        self.build(sandbox, |builder| builder.run(f))
     }
 }
 
@@ -51,7 +59,7 @@ macro_rules! test_prepare_error {
         #[test]
         fn $name() {
             runner::run($krate, |run| {
-                let res = run.build(
+                let res = run.run(
                     rustwide::cmd::SandboxBuilder::new().enable_networking(false),
                     |_| Ok(()),
                 );