Remove CargoResult from cargo-test-support.

Author: ehuss

crates/cargo-test-support/Cargo.toml

@@ -9,6 +9,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
+anyhow = "1.0.34"
 cargo = { path = "../.." }
 cargo-test-macro = { path = "../cargo-test-macro" }
 cargo-util = { path = "../cargo-util" }

crates/cargo-test-support/src/cross_compile.rs

@@ -10,7 +10,6 @@
 //! These tests are all disabled on rust-lang/rust's CI, but run in Cargo's CI.
 
 use crate::{basic_manifest, main_file, project};
-use cargo::CargoResult;
 use cargo_util::ProcessError;
 use std::env;
 use std::fmt::Write;
@@ -41,7 +40,7 @@ pub fn disabled() -> bool {
 
     let cross_target = alternate();
 
-    let run_cross_test = || -> CargoResult<Output> {
+    let run_cross_test = || -> anyhow::Result<Output> {
         let p = project()
             .at("cross_test")
             .file("Cargo.toml", &basic_manifest("cross_test", "1.0.0"))

crates/cargo-test-support/src/lib.rs

@@ -15,7 +15,6 @@ use std::process::{Command, Output};
 use std::str;
 use std::time::{self, Duration};
 
-use cargo::util::CargoResult;
 use cargo_util::{is_ci, ProcessBuilder, ProcessError};
 use serde_json::{self, Value};
 use url::Url;
@@ -702,7 +701,7 @@ impl Execs {
         self
     }
 
-    pub fn exec_with_output(&mut self) -> CargoResult<Output> {
+    pub fn exec_with_output(&mut self) -> anyhow::Result<Output> {
         self.ran = true;
         // TODO avoid unwrap
         let p = (&self.process_builder).clone().unwrap();