itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-11-03 13:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #6968 - ehuss:remove-can_add_color_process, r=alexcrichton

Browse Source 
Remove rustdoc `can_add_color_process`.

This was added in #5995 because at the time, earlier versions of rustdoc didn't support the flag, but those times have long since gone.
This commit is contained in:
bors 2019-05-20 20:32:47 +00:00
commit 1d75407858
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cargo/core/compiler/mod.rs
View File

@ -41,7 +41,7 @@ use crate::core::{PackageId, Target};
use crate::util::errors::{CargoResult, CargoResultExt, Internal, ProcessError}; use crate::util::errors::{CargoResult, CargoResultExt, Internal, ProcessError};
use crate::util::machine_message::Message; use crate::util::machine_message::Message;
use crate::util::paths; use crate::util::paths;
use crate::util::{self, machine_message, process, ProcessBuilder}; use crate::util::{self, machine_message, ProcessBuilder};
use crate::util::{internal, join_paths, profile}; use crate::util::{internal, join_paths, profile};
/// Indicates whether an object is for the host architcture or the target architecture. /// Indicates whether an object is for the host architcture or the target architecture.
@ -636,12 +636,7 @@ fn rustdoc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoResult
rustdoc.arg("--crate-name").arg(&unit.target.crate_name()); rustdoc.arg("--crate-name").arg(&unit.target.crate_name());
add_path_args(bcx, unit, &mut rustdoc); add_path_args(bcx, unit, &mut rustdoc);
add_cap_lints(bcx, unit, &mut rustdoc); add_cap_lints(bcx, unit, &mut rustdoc);
let mut can_add_color_process = process(&*bcx.config.rustdoc()?);
can_add_color_process.args(&["--color", "never", "-V"]);
if bcx.rustc.cached_success(&can_add_color_process)? {
add_color(bcx, &mut rustdoc); add_color(bcx, &mut rustdoc);
}
if unit.kind != Kind::Host { if unit.kind != Kind::Host {
if let Some(ref target) = bcx.build_config.requested_target { if let Some(ref target) = bcx.build_config.requested_target {