diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index 7052c4e5a..3e00cffb0 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -15,8 +15,8 @@ use std::process::{Command, Output}; use std::str; use std::time::{self, Duration}; -use cargo::util::{is_ci, CargoResult, Rustc}; -use cargo_util::{ProcessBuilder, ProcessError}; +use cargo::util::{CargoResult, Rustc}; +use cargo_util::{is_ci, ProcessBuilder, ProcessError}; use serde_json::{self, Value}; use url::Url; diff --git a/crates/cargo-util/src/lib.rs b/crates/cargo-util/src/lib.rs index eb8e46166..d5932d60f 100644 --- a/crates/cargo-util/src/lib.rs +++ b/crates/cargo-util/src/lib.rs @@ -7,3 +7,8 @@ pub use process_error::{exit_status_to_string, is_simple_exit_code, ProcessError mod process_builder; mod process_error; mod read2; + +/// Whether or not this running in a Continuous Integration environment. +pub fn is_ci() -> bool { + std::env::var("CI").is_ok() || std::env::var("TF_BUILD").is_ok() +} diff --git a/crates/resolver-tests/Cargo.toml b/crates/resolver-tests/Cargo.toml index 1d98c6973..5a9924107 100644 --- a/crates/resolver-tests/Cargo.toml +++ b/crates/resolver-tests/Cargo.toml @@ -6,6 +6,7 @@ edition = "2018" [dependencies] cargo = { path = "../.." } +cargo-util = { path = "../cargo-util" } proptest = "0.9.1" lazy_static = "1.3.0" varisat = "0.2.1" diff --git a/crates/resolver-tests/tests/resolve.rs b/crates/resolver-tests/tests/resolve.rs index bd5437fae..e99c645a5 100644 --- a/crates/resolver-tests/tests/resolve.rs +++ b/crates/resolver-tests/tests/resolve.rs @@ -1,6 +1,7 @@ use cargo::core::dependency::DepKind; use cargo::core::Dependency; -use cargo::util::{is_ci, Config}; +use cargo::util::Config; +use cargo_util::is_ci; use resolver_tests::{ assert_contains, assert_same, dep, dep_kind, dep_loc, dep_req, dep_req_kind, loc_names, names, diff --git a/src/cargo/util/mod.rs b/src/cargo/util/mod.rs index 7b3786dca..697091a9d 100644 --- a/src/cargo/util/mod.rs +++ b/src/cargo/util/mod.rs @@ -70,11 +70,6 @@ pub fn elapsed(duration: Duration) -> String { } } -/// Whether or not this running in a Continuous Integration environment. -pub fn is_ci() -> bool { - std::env::var("CI").is_ok() || std::env::var("TF_BUILD").is_ok() -} - pub fn indented_lines(text: &str) -> String { text.lines() .map(|line| { diff --git a/src/cargo/util/progress.rs b/src/cargo/util/progress.rs index 2f58a3d0d..7996d8a95 100644 --- a/src/cargo/util/progress.rs +++ b/src/cargo/util/progress.rs @@ -4,8 +4,8 @@ use std::time::{Duration, Instant}; use crate::core::shell::Verbosity; use crate::util::config::ProgressWhen; -use crate::util::{is_ci, CargoResult, Config}; - +use crate::util::{CargoResult, Config}; +use cargo_util::is_ci; use unicode_width::UnicodeWidthChar; pub struct Progress<'cfg> { diff --git a/tests/internal.rs b/tests/internal.rs index f6d9e5e16..41fb43306 100644 --- a/tests/internal.rs +++ b/tests/internal.rs @@ -4,7 +4,7 @@ use std::fs; #[test] fn check_forbidden_code() { // Do not use certain macros, functions, etc. - if !cargo::util::is_ci() { + if !cargo_util::is_ci() { // Only check these on CI, otherwise it could be annoying. use std::io::Write; writeln!( diff --git a/tests/testsuite/rustdoc_extern_html.rs b/tests/testsuite/rustdoc_extern_html.rs index 820cf7bd6..6281190af 100644 --- a/tests/testsuite/rustdoc_extern_html.rs +++ b/tests/testsuite/rustdoc_extern_html.rs @@ -69,7 +69,7 @@ fn std_docs() { // For local developers, skip this test if docs aren't installed. let docs = std::path::Path::new(&paths::sysroot()).join("share/doc/rust/html"); if !docs.exists() { - if cargo::util::is_ci() { + if cargo_util::is_ci() { panic!("std docs are not installed, check that the rust-docs component is installed"); } else { eprintln!(