Rollup merge of rust-lang#63781 - mati865:clippy, r=oli-obk,ehuss

Centril · web-flow · commit 1294774e94ba · 2019-08-21T17:31:45.000+02:00
Run Clippy without json-rendered flag Removed in rust-lang#62766 Replacing it with `--json=diagnostic-rendered-ansi` fails: ``` error: using `--json` requires also using `--error-format=json` ``` Running `./x.py clippy src/libstd` locally works fine (with colors) on Linux so I don't know if there is something to fix.
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
@@ -875,8 +875,7 @@ impl<'a> Builder<'a> {
         }
 
         if cmd == "clippy" {
-            extra_args.push_str("-Zforce-unstable-if-unmarked -Zunstable-options \
-                --json-rendered=termcolor");
+            extra_args.push_str("-Zforce-unstable-if-unmarked");
         }
 
         if !extra_args.is_empty() {

Original file line number	Diff line number	Diff line change
`@@ -875,8 +875,7 @@ impl<'a> Builder<'a> {`
`875`	`875`	`}`
`876`	`876`
`877`	`877`	`if cmd == "clippy" {`
`878`		`- extra_args.push_str("-Zforce-unstable-if-unmarked -Zunstable-options \`
`879`		`- --json-rendered=termcolor");`
	`878`	`+ extra_args.push_str("-Zforce-unstable-if-unmarked");`
`880`	`879`	`}`
`881`	`880`
`882`	`881`	`if !extra_args.is_empty() {`