Auto merge of #6618 - ehuss:fix-progress-stdout, r=Eh2406

bors · bors · commit 4e74e2fc0908 · 2019-02-02T17:48:44.000Z
Fix overlapping progress with stdout. Minor issue introduced in #6615. The progress bar was not being cleared for stdout output (because Shell only does stderr).
diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs
@@ -300,6 +300,7 @@ impl<'a, 'cfg> JobQueue<'a, 'cfg> {
                         plan.update(&module_name, &cmd, &filenames)?;
                     }
                     Message::Stdout(out) => {
+                        self.progress.clear();
                         println!("{}", out);
                     }
                     Message::Stderr(err) => {

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,7 @@ impl<'a, 'cfg> JobQueue<'a, 'cfg> {`
`300`	`300`	`plan.update(&module_name, &cmd, &filenames)?;`
`301`	`301`	`}`
`302`	`302`	`Message::Stdout(out) => {`
	`303`	`+ self.progress.clear();`
`303`	`304`	`println!("{}", out);`
`304`	`305`	`}`
`305`	`306`	`Message::Stderr(err) => {`