about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-08-21 17:31:45 +0200
committerGitHub <noreply@github.com>2019-08-21 17:31:45 +0200
commit1294774e94ba42702a8405c0add75bef234f550b (patch)
treefe45714c22cfe937c213890b6995b1788eeed146 /src/bootstrap
parent3a1eb34c2ec6fa361e1e1732dd469b06a59952c4 (diff)
parent5cf43bdd54a3e25c8d60da9179fd1bb38213d68e (diff)
downloadrust-1294774e94ba42702a8405c0add75bef234f550b.tar.gz
rust-1294774e94ba42702a8405c0add75bef234f550b.zip
Rollup merge of #63781 - mati865:clippy, r=oli-obk,ehuss
Run Clippy without json-rendered flag

Removed in https://github.com/rust-lang/rust/pull/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.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/builder.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 955809e8074..4e49aaa16ea 100644
--- 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() {