Skip to content

Commit 21cddb7

Browse files
borsbors
committed
Auto merge of #5995 - kennytm:stabilize-compile-progress, r=alexcrichton
Stabilize -Zcompile-progress. Closes #2536.
2 parents b0679d5 + 9597bce commit 21cddb7

18 files changed

+220
-223
lines changed

‎src/bin/cargo/cli.rs

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Available unstable (nightly-only) flags:
3434
-Z offline -- Offline mode that does not perform network requests
3535
-Z unstable-options -- Allow the usage of unstable options such as --registry
3636
-Z config-profile -- Read profiles from .cargo/config files
37-
-Z compile-progress -- Display a progress bar while compiling
3837
3938
Run with 'cargo -Z [FLAG] [SUBCOMMAND]'"
4039
);

‎src/cargo/core/compiler/job_queue.rs

-3
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,6 @@ impl<'a> JobQueue<'a> {
237237
// currently a pretty big task. This is issue #5695.
238238
let mut error = None;
239239
let mut progress = Progress::with_style("Building", ProgressStyle::Ratio, cx.bcx.config);
240-
if !cx.bcx.config.cli_unstable().compile_progress {
241-
progress.disable();
242-
}
243240
let total = self.queue.len();
244241
loop {
245242
// Dequeue as much work as we can, learning about everything

‎src/cargo/core/compiler/mod.rs

+11-21
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ use serde_json;
1010

1111
use core::manifest::TargetSourcePath;
1212
use core::profiles::{Lto, Profile};
13-
use core::shell::ColorChoice;
1413
use core::{PackageId, Target};
1514
use util::errors::{CargoResult, CargoResultExt, Internal};
1615
use util::paths;
17-
use util::{self, machine_message, Freshness, ProcessBuilder};
16+
use util::{self, machine_message, Freshness, ProcessBuilder, process};
1817
use util::{internal, join_paths, profile};
1918

2019
use self::build_plan::BuildPlan;
@@ -241,8 +240,6 @@ fn rustc<'a, 'cfg>(
241240
.unwrap_or_else(|| cx.bcx.config.cwd())
242241
.to_path_buf();
243242

244-
let should_capture_output = cx.bcx.config.cli_unstable().compile_progress;
245-
246243
return Ok(Work::new(move |state| {
247244
// Only at runtime have we discovered what the extra -L and -l
248245
// arguments are for native libraries, so we process those here. We
@@ -292,12 +289,7 @@ fn rustc<'a, 'cfg>(
292289
} else if build_plan {
293290
state.build_plan(buildkey, rustc.clone(), outputs.clone());
294291
} else {
295-
let exec_result = if should_capture_output {
296-
exec.exec_and_capture_output(rustc, &package_id, &target, mode, state)
297-
} else {
298-
exec.exec(rustc, &package_id, &target, mode)
299-
};
300-
exec_result
292+
exec.exec_and_capture_output(rustc, &package_id, &target, mode, state)
301293
.map_err(Internal::new)
302294
.chain_err(|| format!("Could not compile `{}`.", name))?;
303295
}
@@ -591,7 +583,12 @@ fn rustdoc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoResult
591583
rustdoc.arg("--crate-name").arg(&unit.target.crate_name());
592584
add_path_args(bcx, unit, &mut rustdoc);
593585
add_cap_lints(bcx, unit, &mut rustdoc);
594-
add_color(bcx, &mut rustdoc);
586+
587+
let mut can_add_color_process = process(&*bcx.config.rustdoc()?);
588+
can_add_color_process.args(&["--color", "never", "-V"]);
589+
if bcx.rustc.cached_success(&can_add_color_process)? {
590+
add_color(bcx, &mut rustdoc);
591+
}
595592

596593
if unit.kind != Kind::Host {
597594
if let Some(ref target) = bcx.build_config.requested_target {
@@ -629,8 +626,6 @@ fn rustdoc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoResult
629626
let package_id = unit.pkg.package_id().clone();
630627
let target = unit.target.clone();
631628

632-
let should_capture_output = cx.bcx.config.cli_unstable().compile_progress;
633-
634629
Ok(Work::new(move |state| {
635630
if let Some(output) = build_state.outputs.lock().unwrap().get(&key) {
636631
for cfg in output.cfgs.iter() {
@@ -649,10 +644,8 @@ fn rustdoc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoResult
649644
&mut |line| json_stderr(line, &package_id, &target),
650645
false,
651646
).map(drop)
652-
} else if should_capture_output {
653-
state.capture_output(&rustdoc, false).map(drop)
654647
} else {
655-
rustdoc.exec()
648+
state.capture_output(&rustdoc, false).map(drop)
656649
};
657650
exec_result.chain_err(|| format!("Could not document `{}`.", name))?;
658651
Ok(())
@@ -709,12 +702,9 @@ fn add_cap_lints(bcx: &BuildContext, unit: &Unit, cmd: &mut ProcessBuilder) {
709702
}
710703

711704
fn add_color(bcx: &BuildContext, cmd: &mut ProcessBuilder) {
712-
let capture_output = bcx.config.cli_unstable().compile_progress;
713705
let shell = bcx.config.shell();
714-
if capture_output || shell.color_choice() != ColorChoice::CargoAuto {
715-
let color = if shell.supports_color() { "always" } else { "never" };
716-
cmd.args(&["--color", color]);
717-
}
706+
let color = if shell.supports_color() { "always" } else { "never" };
707+
cmd.args(&["--color", color]);
718708
}
719709

720710
fn add_error_format(bcx: &BuildContext, cmd: &mut ProcessBuilder) {

‎src/cargo/core/features.rs

-2
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ pub struct CliUnstable {
318318
pub package_features: bool,
319319
pub advanced_env: bool,
320320
pub config_profile: bool,
321-
pub compile_progress: bool,
322321
}
323322

324323
impl CliUnstable {
@@ -355,7 +354,6 @@ impl CliUnstable {
355354
"package-features" => self.package_features = true,
356355
"advanced-env" => self.advanced_env = true,
357356
"config-profile" => self.config_profile = true,
358-
"compile-progress" => self.compile_progress = true,
359357
_ => bail!("unknown `-Z` flag specified: {}", k),
360358
}
361359

‎src/cargo/util/rustc.rs

+29
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use std::path::{Path, PathBuf};
44
use std::hash::{Hash, Hasher, SipHasher};
55
use std::collections::hash_map::{Entry, HashMap};
66
use std::sync::Mutex;
7+
use std::process::Stdio;
78
use std::env;
89

910
use serde_json;
@@ -83,6 +84,10 @@ impl Rustc {
8384
pub fn cached_output(&self, cmd: &ProcessBuilder) -> CargoResult<(String, String)> {
8485
self.cache.lock().unwrap().cached_output(cmd)
8586
}
87+
88+
pub fn cached_success(&self, cmd: &ProcessBuilder) -> CargoResult<bool> {
89+
self.cache.lock().unwrap().cached_success(cmd)
90+
}
8691
}
8792

8893
/// It is a well known that `rustc` is not the fastest compiler in the world.
@@ -104,6 +109,7 @@ struct Cache {
104109
struct CacheData {
105110
rustc_fingerprint: u64,
106111
outputs: HashMap<u64, (String, String)>,
112+
successes: HashMap<u64, bool>,
107113
}
108114

109115
impl Cache {
@@ -113,6 +119,7 @@ impl Cache {
113119
let empty = CacheData {
114120
rustc_fingerprint,
115121
outputs: HashMap::new(),
122+
successes: HashMap::new(),
116123
};
117124
let mut dirty = true;
118125
let data = match read(&cache_location) {
@@ -177,6 +184,28 @@ impl Cache {
177184
}
178185
}
179186
}
187+
188+
fn cached_success(&mut self, cmd: &ProcessBuilder) -> CargoResult<bool> {
189+
let key = process_fingerprint(cmd);
190+
match self.data.successes.entry(key) {
191+
Entry::Occupied(entry) => {
192+
info!("rustc info cache hit");
193+
Ok(*entry.get())
194+
}
195+
Entry::Vacant(entry) => {
196+
info!("rustc info cache miss");
197+
let success = cmd
198+
.build_command()
199+
.stdout(Stdio::null())
200+
.stderr(Stdio::null())
201+
.status()?
202+
.success();
203+
entry.insert(success);
204+
self.dirty = true;
205+
Ok(success)
206+
}
207+
}
208+
}
180209
}
181210

182211
impl Drop for Cache {

‎src/doc/src/reference/unstable.md

-16
Original file line numberDiff line numberDiff line change
@@ -294,22 +294,6 @@ Example:
294294
cargo +nightly build --build-plan -Z unstable-options
295295
```
296296

297-
### Compile progress
298-
* Tracking Issue: [rust-lang/cargo#2536](https://github.com/rust-lang/cargo/issues/2536)
299-
300-
The `-Z compile-progress` flag enables a progress bar while compiling.
301-
302-
```console
303-
$ cargo +nightly build -Z compile-progress
304-
Compiling libc v0.2.41
305-
Compiling void v1.0.2
306-
Compiling lazy_static v1.0.1
307-
Compiling regex v1.0.0
308-
Compiling ucd-util v0.1.1
309-
Compiling utf8-ranges v1.0.0
310-
Building [=======> ] 2/14: libc, regex, uc...
311-
```
312-
313297
### default-run
314298
* Original issue: [#2200](https://github.com/rust-lang/cargo/issues/2200)
315299

‎tests/testsuite/build.rs

+26-26
Original file line numberDiff line numberDiff line change
@@ -1261,14 +1261,14 @@ fn cargo_default_env_metadata_env_var() {
12611261
.with_stderr(&format!(
12621262
"\
12631263
[COMPILING] bar v0.0.1 ([CWD]/bar)
1264-
[RUNNING] `rustc --crate-name bar bar/src/lib.rs --crate-type dylib \
1264+
[RUNNING] `rustc --crate-name bar bar/src/lib.rs --color never --crate-type dylib \
12651265
--emit=dep-info,link \
12661266
-C prefer-dynamic -C debuginfo=2 \
12671267
-C metadata=[..] \
12681268
--out-dir [..] \
12691269
-L dependency=[CWD]/target/debug/deps`
12701270
[COMPILING] foo v0.0.1 ([CWD])
1271-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
1271+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
12721272
--emit=dep-info,link -C debuginfo=2 \
12731273
-C metadata=[..] \
12741274
-C extra-filename=[..] \
@@ -1288,14 +1288,14 @@ fn cargo_default_env_metadata_env_var() {
12881288
.with_stderr(&format!(
12891289
"\
12901290
[COMPILING] bar v0.0.1 ([CWD]/bar)
1291-
[RUNNING] `rustc --crate-name bar bar/src/lib.rs --crate-type dylib \
1291+
[RUNNING] `rustc --crate-name bar bar/src/lib.rs --color never --crate-type dylib \
12921292
--emit=dep-info,link \
12931293
-C prefer-dynamic -C debuginfo=2 \
12941294
-C metadata=[..] \
12951295
--out-dir [..] \
12961296
-L dependency=[CWD]/target/debug/deps`
12971297
[COMPILING] foo v0.0.1 ([CWD])
1298-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
1298+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
12991299
--emit=dep-info,link -C debuginfo=2 \
13001300
-C metadata=[..] \
13011301
-C extra-filename=[..] \
@@ -1616,7 +1616,7 @@ fn lto_build() {
16161616
.with_stderr(
16171617
"\
16181618
[COMPILING] test v0.0.0 ([CWD])
1619-
[RUNNING] `rustc --crate-name test src/main.rs --crate-type bin \
1619+
[RUNNING] `rustc --crate-name test src/main.rs --color never --crate-type bin \
16201620
--emit=dep-info,link \
16211621
-C opt-level=3 \
16221622
-C lto \
@@ -1635,7 +1635,7 @@ fn verbose_build() {
16351635
.with_stderr(
16361636
"\
16371637
[COMPILING] foo v0.0.1 ([CWD])
1638-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
1638+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
16391639
--emit=dep-info,link -C debuginfo=2 \
16401640
-C metadata=[..] \
16411641
--out-dir [..] \
@@ -1652,7 +1652,7 @@ fn verbose_release_build() {
16521652
.with_stderr(
16531653
"\
16541654
[COMPILING] foo v0.0.1 ([CWD])
1655-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
1655+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
16561656
--emit=dep-info,link \
16571657
-C opt-level=3 \
16581658
-C metadata=[..] \
@@ -1698,7 +1698,7 @@ fn verbose_release_build_deps() {
16981698
.with_stderr(&format!(
16991699
"\
17001700
[COMPILING] foo v0.0.0 ([CWD]/foo)
1701-
[RUNNING] `rustc --crate-name foo foo/src/lib.rs \
1701+
[RUNNING] `rustc --crate-name foo foo/src/lib.rs --color never \
17021702
--crate-type dylib --crate-type rlib \
17031703
--emit=dep-info,link \
17041704
-C prefer-dynamic \
@@ -1707,7 +1707,7 @@ fn verbose_release_build_deps() {
17071707
--out-dir [..] \
17081708
-L dependency=[CWD]/target/release/deps`
17091709
[COMPILING] test v0.0.0 ([CWD])
1710-
[RUNNING] `rustc --crate-name test src/lib.rs --crate-type lib \
1710+
[RUNNING] `rustc --crate-name test src/lib.rs --color never --crate-type lib \
17111711
--emit=dep-info,link \
17121712
-C opt-level=3 \
17131713
-C metadata=[..] \
@@ -4099,41 +4099,41 @@ fn build_filter_infer_profile() {
40994099
p.cargo("build -v")
41004100
.with_stderr_contains(
41014101
"\
4102-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
4102+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
41034103
--emit=dep-info,link[..]",
41044104
).with_stderr_contains(
41054105
"\
4106-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4106+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41074107
--emit=dep-info,link[..]",
41084108
).run();
41094109

41104110
p.root().join("target").rm_rf();
41114111
p.cargo("build -v --test=t1")
41124112
.with_stderr_contains(
41134113
"\
4114-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
4114+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
41154115
--emit=dep-info,link[..]",
41164116
).with_stderr_contains(
4117-
"[RUNNING] `rustc --crate-name t1 tests/t1.rs --emit=dep-info,link[..]",
4117+
"[RUNNING] `rustc --crate-name t1 tests/t1.rs --color never --emit=dep-info,link[..]",
41184118
).with_stderr_contains(
41194119
"\
4120-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4120+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41214121
--emit=dep-info,link[..]",
41224122
).run();
41234123

41244124
p.root().join("target").rm_rf();
41254125
p.cargo("build -v --bench=b1")
41264126
.with_stderr_contains(
41274127
"\
4128-
[RUNNING] `rustc --crate-name foo src/lib.rs --crate-type lib \
4128+
[RUNNING] `rustc --crate-name foo src/lib.rs --color never --crate-type lib \
41294129
--emit=dep-info,link[..]",
41304130
).with_stderr_contains(
41314131
"\
4132-
[RUNNING] `rustc --crate-name b1 benches/b1.rs --emit=dep-info,link \
4132+
[RUNNING] `rustc --crate-name b1 benches/b1.rs --color never --emit=dep-info,link \
41334133
-C opt-level=3[..]",
41344134
).with_stderr_contains(
41354135
"\
4136-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4136+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41374137
--emit=dep-info,link[..]",
41384138
).run();
41394139
}
@@ -4144,15 +4144,15 @@ fn targets_selected_default() {
41444144
p.cargo("build -v")
41454145
// bin
41464146
.with_stderr_contains("\
4147-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4147+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41484148
--emit=dep-info,link[..]")
41494149
// bench
41504150
.with_stderr_does_not_contain("\
4151-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4151+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41524152
-C opt-level=3 --test [..]")
41534153
// unit test
41544154
.with_stderr_does_not_contain("\
4155-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4155+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41564156
-C debuginfo=2 --test [..]").run();
41574157
}
41584158

@@ -4162,15 +4162,15 @@ fn targets_selected_all() {
41624162
p.cargo("build -v --all-targets")
41634163
// bin
41644164
.with_stderr_contains("\
4165-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4165+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41664166
--emit=dep-info,link[..]")
41674167
// bench
41684168
.with_stderr_contains("\
4169-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4169+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41704170
-C opt-level=3 --test [..]")
41714171
// unit test
41724172
.with_stderr_contains("\
4173-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4173+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41744174
-C debuginfo=2 --test [..]").run();
41754175
}
41764176

@@ -4180,15 +4180,15 @@ fn all_targets_no_lib() {
41804180
p.cargo("build -v --all-targets")
41814181
// bin
41824182
.with_stderr_contains("\
4183-
[RUNNING] `rustc --crate-name foo src/main.rs --crate-type bin \
4183+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --crate-type bin \
41844184
--emit=dep-info,link[..]")
41854185
// bench
41864186
.with_stderr_contains("\
4187-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4187+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41884188
-C opt-level=3 --test [..]")
41894189
// unit test
41904190
.with_stderr_contains("\
4191-
[RUNNING] `rustc --crate-name foo src/main.rs --emit=dep-info,link \
4191+
[RUNNING] `rustc --crate-name foo src/main.rs --color never --emit=dep-info,link \
41924192
-C debuginfo=2 --test [..]").run();
41934193
}
41944194

0 commit comments

Comments
 (0)