Add clippy and fix commands to x.py #56595

ljedrz · Dec 7, 2018

Since they are kind of similar in nature, I have used the same approach as for cargo check. At least some of the boilerplate could probably be shared, but I'd prefer to gather some feedback before I decide to merge them more aggressively.

This works reasonably well for clippy; with -A clippy::all and some extra #![feature(rustc_private)]s almost the whole codebase can be processed. There are some concerns, though:

unlike check, in order to be able to traverse all the crates, some of them need to be marked with the #![feature(rustc_private)] attribute
-W clippy::all breaks on any error. Is there a way to produce errors but not have them break the progress?
I'm not sure how to redirect the errors in a way that would show colors; for now I was able to de-jsonize and print them (something not needed for check)

cargo fix is much more stubborn; it refuses to acknowledge crates like core and std, so it doesn't progress much at all.

Since this is a bit more tricky than I have envisioned, I need some guidance:

is this the right approach or am I doing something very wrong ^^?
why are the extra rustc_private features necessary? I was hoping for the same treatment as check
are changes in clippy and cargo fix needed e.g. in order to produce errors in the same manner as check or did I miss something?
do we need this level of file granularity (e.g. for futureproofing) or can check, clippy and fix files be condensed?

Hopes-to-fix: #53896

Cc @alexcrichton, @zackmdavis

rust-highfive · Dec 7, 2018

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

bors · Dec 8, 2018

☔️ The latest upstream changes (presumably #56258) made this pull request unmergeable. Please resolve the merge conflicts.

nikomatsakis · Dec 10, 2018

r? @alexcrichton

alexcrichton · Dec 14, 2018

Thanks for the PR! I'm somewhat hesitant to merge this in though because it seems like it's presumably duplicating a lot of code already there for other aspects of rustbuild. Rustbuild already suffers from a good deal of duplication, so I think I'd personally prefer if we could try to explore strategies of deduplication before merging these in

mark-i-m · Dec 14, 2018

I would kind of like to merge this actually. It would be a big step towards moving the compiler to edition 2018.

ljedrz · Dec 15, 2018

@alexcrichton there is definitely room for improvement in terms of deduplication, that's one of the reasons for the WIP; I just wanted to make sure the general approach was fine before squeezing the code a bit more.

I'll rebase and deduplicate the code shortly.

ljedrz · Dec 15, 2018

@alexcrichton I updated the commit - the new commands are now integrated into check.rs.

bors · Dec 16, 2018

☔️ The latest upstream changes (presumably #56600) made this pull request unmergeable. Please resolve the merge conflicts.

ljedrz · Dec 16, 2018

Rebased.

sinkuu · Dec 16, 2018

sinkuu reviewed Dec 16, 2018

View changes

sinkuu · Dec 16, 2018

src/bootstrap/check.rs

@@ -23,6 +23,22 @@ pub struct Std {
    pub target: Interned<String>,
 }

+fn args(kind: Kind) -> Vec<String> {
+    match kind {
+        Kind::Clippy => vec!["--".to_owned(), "-W".to_owned(), "clippy::all".to_owned()],


-W clippy::all breaks on any error. Is there a way to produce errors but not have them break the progress?

--cap-lints warn should work.

I managed to pass it into clippy arguments, but it doesn't seem to be enough 🤔.

sinkuu · Dec 16, 2018

unlike check, in order to be able to traverse all the crates, some of them need to be marked with the #![feature(rustc_private)] attribute

You can make Builder::cargo to add RUSTFLAGS="-Zforce-unstable-if-unmarked" instead of RUSTC_FORCE_UNSTABLE=1 when cmd == "clippy". Bootstrap's rustc shim adds the flag when RUSTC_FORCE_UNSTABLE is found, but cargo clippy invokes its own rustc driver.

I'm not sure how to redirect the errors in a way that would show colors; for now I was able to de-jsonize and print them (something not needed for check)

This is also due to rustc shim. It removes --message-format json from args passed to rustc, so rustc normally prints colored errors to stderr.

ljedrz · Dec 16, 2018

Thanks for the suggestions @sinkuu! I'll apply them soon.

Edit: I added RUSTFLAGS="-Zforce-unstable-if-unmarked" for clippy and fix, but I don't know how I can override --message-format json; any ideas?

Dylan-DPC · Feb 11, 2019

ping from triage @ljedrz you have conflicts to address

ljedrz · Feb 12, 2019

Rebased.

rust-highfive · Feb 12, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:105e076f:start=1549965647168432648,finish=1549965648142243702,duration=973811054
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:04:28]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:04:30] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:30]     --> src/bootstrap/check.rs:55:9
[00:04:30]      |
[00:04:30] 55   | /         run_cargo(builder,
[00:04:30] 56   | |                   &mut cargo,
[00:04:30] 57   | |                   args(builder.kind),
[00:04:30] 58   | |                   &libstd_stamp(builder, compiler, target),
[00:04:30] 59   | |                   true);
[00:04:30]      | 
[00:04:30]     ::: src/bootstrap/compile.rs:1006:1
[00:04:30]      |
[00:04:30]      |
[00:04:30] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:30] 1007 | |                  cargo: &mut Command,
[00:04:30] 1008 | |                  stamp: &Path,
[00:04:30] 1009 | |                  is_check: bool)
[00:04:30] 1154 | |     deps
[00:04:30] 1155 | | }
[00:04:30]      | |_- defined here
[00:04:30] 
[00:04:30] 
[00:04:30] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:30]     --> src/bootstrap/check.rs:103:9
[00:04:30]      |
[00:04:30] 103  | /         run_cargo(builder,
[00:04:30] 104  | |                   &mut cargo,
[00:04:30] 105  | |                   args(builder.kind),
[00:04:30] 106  | |                   &librustc_stamp(builder, compiler, target),
[00:04:30] 107  | |                   true);
[00:04:30]      | 
[00:04:30]     ::: src/bootstrap/compile.rs:1006:1
[00:04:30]      |
[00:04:30]      |
[00:04:30] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:30] 1007 | |                  cargo: &mut Command,
[00:04:30] 1008 | |                  stamp: &Path,
[00:04:30] 1009 | |                  is_check: bool)
[00:04:30] 1154 | |     deps
[00:04:30] 1155 | | }
[00:04:30]      | |_- defined here
[00:04:30] 
[00:04:30] 
[00:04:30] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:30]     --> src/bootstrap/check.rs:155:9
[00:04:30]      |
[00:04:30] 155  | /         run_cargo(builder,
[00:04:30] 156  | |                   &mut cargo,
[00:04:30] 157  | |                   args(builder.kind),
[00:04:30] 158  | |                   &codegen_backend_stamp(builder, compiler, target, backend),
[00:04:30] 159  | |                   true);
[00:04:30]      | 
[00:04:30]     ::: src/bootstrap/compile.rs:1006:1
[00:04:30]      |
[00:04:30]      |
[00:04:30] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:30] 1007 | |                  cargo: &mut Command,
[00:04:30] 1008 | |                  stamp: &Path,
[00:04:30] 1009 | |                  is_check: bool)
[00:04:30] 1154 | |     deps
[00:04:30] 1155 | | }
[00:04:30]      | |_- defined here
[00:04:30] 
[00:04:30] 
[00:04:30] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:30]     --> src/bootstrap/check.rs:193:9
[00:04:30]      |
[00:04:30] 193  | /         run_cargo(builder,
[00:04:30] 194  | |                   &mut cargo,
[00:04:30] 195  | |                   args(builder.kind),
[00:04:30] 196  | |                   &libtest_stamp(builder, compiler, target),
[00:04:30] 197  | |                   true);
[00:04:30]      | 
[00:04:30]     ::: src/bootstrap/compile.rs:1006:1
[00:04:30]      |
[00:04:30]      |
[00:04:30] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:30] 1007 | |                  cargo: &mut Command,
[00:04:30] 1008 | |                  stamp: &Path,
[00:04:30] 1009 | |                  is_check: bool)
[00:04:30] 1154 | |     deps
[00:04:30] 1155 | | }
[00:04:30]      | |_- defined here
[00:04:30] 
[00:04:30] 
[00:04:30] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:30]     --> src/bootstrap/check.rs:241:9
[00:04:30]      |
[00:04:30] 241  | /         run_cargo(builder,
[00:04:30] 242  | |                   &mut cargo,
[00:04:30] 243  | |                   args(builder.kind),
[00:04:30] 244  | |                   &rustdoc_stamp(builder, compiler, target),
[00:04:30] 245  | |                   true);
[00:04:30]      | 
[00:04:30]     ::: src/bootstrap/compile.rs:1006:1
[00:04:30]      |
[00:04:30]      |
[00:04:30] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:30] 1007 | |                  cargo: &mut Command,
[00:04:30] 1008 | |                  stamp: &Path,
[00:04:30] 1009 | |                  is_check: bool)
[00:04:30] 1154 | |     deps
[00:04:30] 1155 | | }
[00:04:30]      | |_- defined here
[00:04:30] 
---
[00:04:33]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:04:35] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:35]     --> src/bootstrap/check.rs:55:9
[00:04:35]      |
[00:04:35] 55   | /         run_cargo(builder,
[00:04:35] 56   | |                   &mut cargo,
[00:04:35] 57   | |                   args(builder.kind),
[00:04:35] 58   | |                   &libstd_stamp(builder, compiler, target),
[00:04:35] 59   | |                   true);
[00:04:35]      | 
[00:04:35]     ::: src/bootstrap/compile.rs:1006:1
[00:04:35]      |
[00:04:35]      |
[00:04:35] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:35] 1007 | |                  cargo: &mut Command,
[00:04:35] 1008 | |                  stamp: &Path,
[00:04:35] 1009 | |                  is_check: bool)
[00:04:35] 1154 | |     deps
[00:04:35] 1155 | | }
[00:04:35]      | |_- defined here
[00:04:35] 
[00:04:35] 
[00:04:35] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:35]     --> src/bootstrap/check.rs:103:9
[00:04:35]      |
[00:04:35] 103  | /         run_cargo(builder,
[00:04:35] 104  | |                   &mut cargo,
[00:04:35] 105  | |                   args(builder.kind),
[00:04:35] 106  | |                   &librustc_stamp(builder, compiler, target),
[00:04:35] 107  | |                   true);
[00:04:35]      | 
[00:04:35]     ::: src/bootstrap/compile.rs:1006:1
[00:04:35]      |
[00:04:35]      |
[00:04:35] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:35] 1007 | |                  cargo: &mut Command,
[00:04:35] 1008 | |                  stamp: &Path,
[00:04:35] 1009 | |                  is_check: bool)
[00:04:35] 1154 | |     deps
[00:04:35] 1155 | | }
[00:04:35]      | |_- defined here
[00:04:35] 
[00:04:35] 
[00:04:35] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:35]     --> src/bootstrap/check.rs:155:9
[00:04:35]      |
[00:04:35] 155  | /         run_cargo(builder,
[00:04:35] 156  | |                   &mut cargo,
[00:04:35] 157  | |                   args(builder.kind),
[00:04:35] 158  | |                   &codegen_backend_stamp(builder, compiler, target, backend),
[00:04:35] 159  | |                   true);
[00:04:35]      | 
[00:04:35]     ::: src/bootstrap/compile.rs:1006:1
[00:04:35]      |
[00:04:35]      |
[00:04:35] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:35] 1007 | |                  cargo: &mut Command,
[00:04:35] 1008 | |                  stamp: &Path,
[00:04:35] 1009 | |                  is_check: bool)
[00:04:35] 1154 | |     deps
[00:04:35] 1155 | | }
[00:04:35]      | |_- defined here
[00:04:35] 
[00:04:35] 
[00:04:35] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:35]     --> src/bootstrap/check.rs:193:9
[00:04:35]      |
[00:04:35] 193  | /         run_cargo(builder,
[00:04:35] 194  | |                   &mut cargo,
[00:04:35] 195  | |                   args(builder.kind),
[00:04:35] 196  | |                   &libtest_stamp(builder, compiler, target),
[00:04:35] 197  | |                   true);
[00:04:35]      | 
[00:04:35]     ::: src/bootstrap/compile.rs:1006:1
[00:04:35]      |
[00:04:35]      |
[00:04:35] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:35] 1007 | |                  cargo: &mut Command,
[00:04:35] 1008 | |                  stamp: &Path,
[00:04:35] 1009 | |                  is_check: bool)
[00:04:35] 1154 | |     deps
[00:04:35] 1155 | | }
[00:04:35]      | |_- defined here
[00:04:35] 
[00:04:35] 
[00:04:35] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:35]     --> src/bootstrap/check.rs:241:9
[00:04:35]      |
[00:04:35] 241  | /         run_cargo(builder,
[00:04:35] 242  | |                   &mut cargo,
[00:04:35] 243  | |                   args(builder.kind),
[00:04:35] 244  | |                   &rustdoc_stamp(builder, compiler, target),
[00:04:35] 245  | |                   true);
[00:04:35]      | 
[00:04:35]     ::: src/bootstrap/compile.rs:1006:1
[00:04:35]      |
[00:04:35]      |
[00:04:35] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:35] 1007 | |                  cargo: &mut Command,
[00:04:35] 1008 | |                  stamp: &Path,
[00:04:35] 1009 | |                  is_check: bool)
[00:04:35] 1154 | |     deps
[00:04:35] 1155 | | }
[00:04:35]      | |_- defined here
[00:04:35] 
---
[00:04:40]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:04:42] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:42]     --> src/bootstrap/check.rs:55:9
[00:04:42]      |
[00:04:42] 55   | /         run_cargo(builder,
[00:04:42] 56   | |                   &mut cargo,
[00:04:42] 57   | |                   args(builder.kind),
[00:04:42] 58   | |                   &libstd_stamp(builder, compiler, target),
[00:04:42] 59   | |                   true);
[00:04:42]      | 
[00:04:42]     ::: src/bootstrap/compile.rs:1006:1
[00:04:42]      |
[00:04:42]      |
[00:04:42] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:42] 1007 | |                  cargo: &mut Command,
[00:04:42] 1008 | |                  stamp: &Path,
[00:04:42] 1009 | |                  is_check: bool)
[00:04:42] 1154 | |     deps
[00:04:42] 1155 | | }
[00:04:42]      | |_- defined here
[00:04:42] 
[00:04:42] 
[00:04:42] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:42]     --> src/bootstrap/check.rs:103:9
[00:04:42]      |
[00:04:42] 103  | /         run_cargo(builder,
[00:04:42] 104  | |                   &mut cargo,
[00:04:42] 105  | |                   args(builder.kind),
[00:04:42] 106  | |                   &librustc_stamp(builder, compiler, target),
[00:04:42] 107  | |                   true);
[00:04:42]      | 
[00:04:42]     ::: src/bootstrap/compile.rs:1006:1
[00:04:42]      |
[00:04:42]      |
[00:04:42] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:42] 1007 | |                  cargo: &mut Command,
[00:04:42] 1008 | |                  stamp: &Path,
[00:04:42] 1009 | |                  is_check: bool)
[00:04:42] 1154 | |     deps
[00:04:42] 1155 | | }
[00:04:42]      | |_- defined here
[00:04:42] 
[00:04:42] 
[00:04:42] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:42]     --> src/bootstrap/check.rs:155:9
[00:04:42]      |
[00:04:42] 155  | /         run_cargo(builder,
[00:04:42] 156  | |                   &mut cargo,
[00:04:42] 157  | |                   args(builder.kind),
[00:04:42] 158  | |                   &codegen_backend_stamp(builder, compiler, target, backend),
[00:04:42] 159  | |                   true);
[00:04:42]      | 
[00:04:42]     ::: src/bootstrap/compile.rs:1006:1
[00:04:42]      |
[00:04:42]      |
[00:04:42] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:42] 1007 | |                  cargo: &mut Command,
[00:04:42] 1008 | |                  stamp: &Path,
[00:04:42] 1009 | |                  is_check: bool)
[00:04:42] 1154 | |     deps
[00:04:42] 1155 | | }
[00:04:42]      | |_- defined here
[00:04:42] 
[00:04:42] 
[00:04:42] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:42]     --> src/bootstrap/check.rs:193:9
[00:04:42]      |
[00:04:42] 193  | /         run_cargo(builder,
[00:04:42] 194  | |                   &mut cargo,
[00:04:42] 195  | |                   args(builder.kind),
[00:04:42] 196  | |                   &libtest_stamp(builder, compiler, target),
[00:04:42] 197  | |                   true);
[00:04:42]      | 
[00:04:42]     ::: src/bootstrap/compile.rs:1006:1
[00:04:42]      |
[00:04:42]      |
[00:04:42] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:42] 1007 | |                  cargo: &mut Command,
[00:04:42] 1008 | |                  stamp: &Path,
[00:04:42] 1009 | |                  is_check: bool)
[00:04:42] 1154 | |     deps
[00:04:42] 1155 | | }
[00:04:42]      | |_- defined here
[00:04:42] 
[00:04:42] 
[00:04:42] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:42]     --> src/bootstrap/check.rs:241:9
[00:04:42]      |
[00:04:42] 241  | /         run_cargo(builder,
[00:04:42] 242  | |                   &mut cargo,
[00:04:42] 243  | |                   args(builder.kind),
[00:04:42] 244  | |                   &rustdoc_stamp(builder, compiler, target),
[00:04:42] 245  | |                   true);
[00:04:42]      | 
[00:04:42]     ::: src/bootstrap/compile.rs:1006:1
[00:04:42]      |
[00:04:42]      |
[00:04:42] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:42] 1007 | |                  cargo: &mut Command,
[00:04:42] 1008 | |                  stamp: &Path,
[00:04:42] 1009 | |                  is_check: bool)
[00:04:42] 1154 | |     deps
[00:04:42] 1155 | | }
[00:04:42]      | |_- defined here
[00:04:42] 
---
[00:04:47]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:04:49] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:49]     --> src/bootstrap/check.rs:55:9
[00:04:49]      |
[00:04:49] 55   | /         run_cargo(builder,
[00:04:49] 56   | |                   &mut cargo,
[00:04:49] 57   | |                   args(builder.kind),
[00:04:49] 58   | |                   &libstd_stamp(builder, compiler, target),
[00:04:49] 59   | |                   true);
[00:04:49]      | 
[00:04:49]     ::: src/bootstrap/compile.rs:1006:1
[00:04:49]      |
[00:04:49]      |
[00:04:49] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:49] 1007 | |                  cargo: &mut Command,
[00:04:49] 1008 | |                  stamp: &Path,
[00:04:49] 1009 | |                  is_check: bool)
[00:04:49] 1154 | |     deps
[00:04:49] 1155 | | }
[00:04:49]      | |_- defined here
[00:04:49] 
[00:04:49] 
[00:04:49] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:49]     --> src/bootstrap/check.rs:103:9
[00:04:49]      |
[00:04:49] 103  | /         run_cargo(builder,
[00:04:49] 104  | |                   &mut cargo,
[00:04:49] 105  | |                   args(builder.kind),
[00:04:49] 106  | |                   &librustc_stamp(builder, compiler, target),
[00:04:49] 107  | |                   true);
[00:04:49]      | 
[00:04:49]     ::: src/bootstrap/compile.rs:1006:1
[00:04:49]      |
[00:04:49]      |
[00:04:49] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:49] 1007 | |                  cargo: &mut Command,
[00:04:49] 1008 | |                  stamp: &Path,
[00:04:49] 1009 | |                  is_check: bool)
[00:04:49] 1154 | |     deps
[00:04:49] 1155 | | }
[00:04:49]      | |_- defined here
[00:04:49] 
[00:04:49] 
[00:04:49] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:49]     --> src/bootstrap/check.rs:155:9
[00:04:49]      |
[00:04:49] 155  | /         run_cargo(builder,
[00:04:49] 156  | |                   &mut cargo,
[00:04:49] 157  | |                   args(builder.kind),
[00:04:49] 158  | |                   &codegen_backend_stamp(builder, compiler, target, backend),
[00:04:49] 159  | |                   true);
[00:04:49]      | 
[00:04:49]     ::: src/bootstrap/compile.rs:1006:1
[00:04:49]      |
[00:04:49]      |
[00:04:49] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:49] 1007 | |                  cargo: &mut Command,
[00:04:49] 1008 | |                  stamp: &Path,
[00:04:49] 1009 | |                  is_check: bool)
[00:04:49] 1154 | |     deps
[00:04:49] 1155 | | }
[00:04:49]      | |_- defined here
[00:04:49] 
[00:04:49] 
[00:04:49] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:49]     --> src/bootstrap/check.rs:193:9
[00:04:49]      |
[00:04:49] 193  | /         run_cargo(builder,
[00:04:49] 194  | |                   &mut cargo,
[00:04:49] 195  | |                   args(builder.kind),
[00:04:49] 196  | |                   &libtest_stamp(builder, compiler, target),
[00:04:49] 197  | |                   true);
[00:04:49]      | 
[00:04:49]     ::: src/bootstrap/compile.rs:1006:1
[00:04:49]      |
[00:04:49]      |
[00:04:49] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:49] 1007 | |                  cargo: &mut Command,
[00:04:49] 1008 | |                  stamp: &Path,
[00:04:49] 1009 | |                  is_check: bool)
[00:04:49] 1154 | |     deps
[00:04:49] 1155 | | }
[00:04:49]      | |_- defined here
[00:04:49] 
[00:04:49] 
[00:04:49] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:49]     --> src/bootstrap/check.rs:241:9
[00:04:49]      |
[00:04:49] 241  | /         run_cargo(builder,
[00:04:49] 242  | |                   &mut cargo,
[00:04:49] 243  | |                   args(builder.kind),
[00:04:49] 244  | |                   &rustdoc_stamp(builder, compiler, target),
[00:04:49] 245  | |                   true);
[00:04:49]      | 
[00:04:49]     ::: src/bootstrap/compile.rs:1006:1
[00:04:49]      |
[00:04:49]      |
[00:04:49] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:49] 1007 | |                  cargo: &mut Command,
[00:04:49] 1008 | |                  stamp: &Path,
[00:04:49] 1009 | |                  is_check: bool)
[00:04:49] 1154 | |     deps
[00:04:49] 1155 | | }
[00:04:49]      | |_- defined here
[00:04:49] 
---
[00:04:56]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:04:58] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:58]     --> src/bootstrap/check.rs:55:9
[00:04:58]      |
[00:04:58] 55   | /         run_cargo(builder,
[00:04:58] 56   | |                   &mut cargo,
[00:04:58] 57   | |                   args(builder.kind),
[00:04:58] 58   | |                   &libstd_stamp(builder, compiler, target),
[00:04:58] 59   | |                   true);
[00:04:58]      | 
[00:04:58]     ::: src/bootstrap/compile.rs:1006:1
[00:04:58]      |
[00:04:58]      |
[00:04:58] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:58] 1007 | |                  cargo: &mut Command,
[00:04:58] 1008 | |                  stamp: &Path,
[00:04:58] 1009 | |                  is_check: bool)
[00:04:58] 1154 | |     deps
[00:04:58] 1155 | | }
[00:04:58]      | |_- defined here
[00:04:58] 
[00:04:58] 
[00:04:58] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:58]     --> src/bootstrap/check.rs:103:9
[00:04:58]      |
[00:04:58] 103  | /         run_cargo(builder,
[00:04:58] 104  | |                   &mut cargo,
[00:04:58] 105  | |                   args(builder.kind),
[00:04:58] 106  | |                   &librustc_stamp(builder, compiler, target),
[00:04:58] 107  | |                   true);
[00:04:58]      | 
[00:04:58]     ::: src/bootstrap/compile.rs:1006:1
[00:04:58]      |
[00:04:58]      |
[00:04:58] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:58] 1007 | |                  cargo: &mut Command,
[00:04:58] 1008 | |                  stamp: &Path,
[00:04:58] 1009 | |                  is_check: bool)
[00:04:58] 1154 | |     deps
[00:04:58] 1155 | | }
[00:04:58]      | |_- defined here
[00:04:58] 
[00:04:58] 
[00:04:58] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:58]     --> src/bootstrap/check.rs:155:9
[00:04:58]      |
[00:04:58] 155  | /         run_cargo(builder,
[00:04:58] 156  | |                   &mut cargo,
[00:04:58] 157  | |                   args(builder.kind),
[00:04:58] 158  | |                   &codegen_backend_stamp(builder, compiler, target, backend),
[00:04:58] 159  | |                   true);
[00:04:58]      | 
[00:04:58]     ::: src/bootstrap/compile.rs:1006:1
[00:04:58]      |
[00:04:58]      |
[00:04:58] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:58] 1007 | |                  cargo: &mut Command,
[00:04:58] 1008 | |                  stamp: &Path,
[00:04:58] 1009 | |                  is_check: bool)
[00:04:58] 1154 | |     deps
[00:04:58] 1155 | | }
[00:04:58]      | |_- defined here
[00:04:58] 
[00:04:58] 
[00:04:58] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:58]     --> src/bootstrap/check.rs:193:9
[00:04:58]      |
[00:04:58] 193  | /         run_cargo(builder,
[00:04:58] 194  | |                   &mut cargo,
[00:04:58] 195  | |                   args(builder.kind),
[00:04:58] 196  | |                   &libtest_stamp(builder, compiler, target),
[00:04:58] 197  | |                   true);
[00:04:58]      | 
[00:04:58]     ::: src/bootstrap/compile.rs:1006:1
[00:04:58]      |
[00:04:58]      |
[00:04:58] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:58] 1007 | |                  cargo: &mut Command,
[00:04:58] 1008 | |                  stamp: &Path,
[00:04:58] 1009 | |                  is_check: bool)
[00:04:58] 1154 | |     deps
[00:04:58] 1155 | | }
[00:04:58]      | |_- defined here
[00:04:58] 
[00:04:58] 
[00:04:58] error[E0061]: this function takes 4 parameters but 5 parameters were supplied
[00:04:58]     --> src/bootstrap/check.rs:241:9
[00:04:58]      |
[00:04:58] 241  | /         run_cargo(builder,
[00:04:58] 242  | |                   &mut cargo,
[00:04:58] 243  | |                   args(builder.kind),
[00:04:58] 244  | |                   &rustdoc_stamp(builder, compiler, target),
[00:04:58] 245  | |                   true);
[00:04:58]      | 
[00:04:58]     ::: src/bootstrap/compile.rs:1006:1
[00:04:58]      |
[00:04:58]      |
[00:04:58] 1006 | / pub fn run_cargo(builder: &Builder,
[00:04:58] 1007 | |                  cargo: &mut Command,
[00:04:58] 1008 | |                  stamp: &Path,
[00:04:58] 1009 | |                  is_check: bool)
[00:04:58] 1154 | |     deps
[00:04:58] 1155 | | }
[00:04:58]      | |_- defined here
[00:04:58] 
---
travis_time:end:2840d3ef:start=1549965960292107228,finish=1549965960298583470,duration=6476242
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0722374c
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:26505ca8
travis_time:start:26505ca8
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:110e72f8
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · Feb 13, 2019

☔️ The latest upstream changes (presumably #58238) made this pull request unmergeable. Please resolve the merge conflicts.

Dylan-DPC · Feb 25, 2019

ping from triage @ljedrz you have conflicts to attend to.

bors · Feb 25, 2019

☔️ The latest upstream changes (presumably #58728) made this pull request unmergeable. Please resolve the merge conflicts.

Dylan-DPC · Mar 11, 2019

ping from triage @ljedrz
Unfortunately we haven't heard from you on this in a while, so I'm closing the PR to keep things tidy. Don't worry though, if you'll have time again in the future please reopen this PR, we'll be happy to review it again!

ljedrz · Mar 11, 2019

@Dylan-DPC actually I forgot about this one among the HirIdification efforts ^^.

@oli-obk is there still a plan to include that unstable flag that would allow normal errors to be printed?

Dylan-DPC · Mar 11, 2019

@ljedrz oops.. haven't closed it yet :P do you plan on working on it this week or can i close it and you can reoopen or create a new PR (preferably) when you feel like working on it?

oli-obk · Mar 11, 2019

@ljedrz I'll hack something up

ljedrz · Mar 11, 2019

@Dylan-DPC rebasing this shouldn't be a problem, I can do it shortly.

ljedrz · Mar 11, 2019

Rebased.

TimNN · Mar 19, 2019

Ping from triage @ljedrz, @oli-obk: If I understand correctly, this PR is blocked on another, yet-to-be-written PR, correct?

oli-obk · Mar 19, 2019

It's blocked on #59128 getting merged (which is waiting for bors to get to it)

mark-i-m · Mar 20, 2019

Would it make sense to have bors increase the priority of PRs that are blocking other PRs?

rust-highfive assigned nikomatsakis Dec 7, 2018

rust-highfive added the S-waiting-on-review label Dec 7, 2018

ljedrz referenced this pull request Dec 7, 2018
Merged
bootstrap: fix edition #56600

rust-highfive assigned alexcrichton and unassigned nikomatsakis Dec 10, 2018

alexcrichton referenced this pull request Dec 10, 2018
Closed
Add more rust_private attributes #56559

bors added a commit that referenced this pull request Dec 11, 2018

Auto merge of #56600 - ljedrz:fix_edition, r=Mark-Simulacrum
bootstrap: fix edition A byproduct of work on #56595; done with `cargo fix --edition`.

Loading status checks…

dfc4093

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from 9135b3e to 0e43db1 Dec 15, 2018

ljedrz changed the title ~~[WIP] Add clippy and fix commands to x.py~~ Add clippy and fix commands to x.py Dec 15, 2018

bors added a commit that referenced this pull request Dec 15, 2018

Auto merge of #56600 - ljedrz:fix_edition, r=Mark-Simulacrum
bootstrap: fix edition A byproduct of work on #56595; done with `cargo fix --edition`.

Loading status checks…

547cd21

bors added a commit that referenced this pull request Dec 15, 2018

Auto merge of #56600 - ljedrz:fix_edition, r=Mark-Simulacrum
bootstrap: fix edition A byproduct of work on #56595; done with `cargo fix --edition`.

Loading status checks…

748d354

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from 0e43db1 to aee9a7a Dec 16, 2018

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch 2 times, most recently from 5176bb1 to 0820b48 Dec 17, 2018

Dylan-DPC removed the S-waiting-on-review label Feb 11, 2019

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from 0820b48 to b4362a2 Feb 12, 2019

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from b4362a2 to bbc1323 Feb 12, 2019

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from bbc1323 to cfab6c7 Feb 13, 2019

oli-obk referenced this pull request Feb 26, 2019
Closed
Cosmetic changes to compiler comments and docs #58619

Add clippy and fix commands to x.py

Loading status checks…

c0d52e7

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from cfab6c7 to c0d52e7 Mar 11, 2019

oli-obk referenced this pull request Mar 12, 2019
Open
Emit ansi color codes in the `rendered` field of json diagnostics #59128

TimNN added S-waiting-on-review S-blocked and removed S-waiting-on-author S-waiting-on-review labels Mar 19, 2019

bors added a commit that referenced this pull request Mar 23, 2019

Auto merge of #59128 - oli-obk:colorful_json, r=mark-i-m,eddyb
Emit ansi color codes in the `rendered` field of json diagnostics cc @ljedrz Implemented for #56595 (comment) (x.py clippy)

Loading status checks…

af2fe35

Dylan-DPC added S-blocked and removed S-blocked labels Apr 1, 2019

rust-lang/rust

Join GitHub today

Add clippy and fix commands to x.py #56595

Conversation

ljedrz commented Dec 7, 2018 • edited

rust-highfive assigned nikomatsakis Dec 7, 2018

This comment has been minimized.

rust-highfive commented Dec 7, 2018

rust-highfive added the S-waiting-on-review label Dec 7, 2018

ljedrz referenced this pull request Dec 7, 2018

bootstrap: fix edition #56600

This comment has been minimized.

bors commented Dec 8, 2018

This comment has been minimized.

nikomatsakis commented Dec 10, 2018

rust-highfive assigned alexcrichton and unassigned nikomatsakis Dec 10, 2018

alexcrichton referenced this pull request Dec 10, 2018

Add more rust_private attributes #56559

bors added a commit that referenced this pull request Dec 11, 2018

kennytm added a commit to kennytm/rust that referenced this pull request Dec 12, 2018

kennytm added a commit to kennytm/rust that referenced this pull request Dec 13, 2018

kennytm added a commit to kennytm/rust that referenced this pull request Dec 14, 2018

kennytm added a commit to kennytm/rust that referenced this pull request Dec 14, 2018

This comment has been minimized.

alexcrichton commented Dec 14, 2018

This comment has been minimized.

mark-i-m commented Dec 14, 2018

This comment has been minimized.

ljedrz commented Dec 15, 2018

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from 9135b3e to 0e43db1 Dec 15, 2018

ljedrz changed the title [WIP] Add clippy and fix commands to x.py Add clippy and fix commands to x.py Dec 15, 2018

This comment has been minimized.

ljedrz commented Dec 15, 2018 • edited

bors added a commit that referenced this pull request Dec 15, 2018

bors added a commit that referenced this pull request Dec 15, 2018

This comment has been minimized.

bors commented Dec 16, 2018

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from 0e43db1 to aee9a7a Dec 16, 2018

This comment has been minimized.

ljedrz commented Dec 16, 2018

sinkuu reviewed Dec 16, 2018 View changes

This comment has been minimized.

sinkuu Dec 16, 2018

This comment has been minimized.

ljedrz Dec 17, 2018 • edited

This comment has been minimized.

sinkuu commented Dec 16, 2018 • edited

This comment has been minimized.

ljedrz commented Dec 16, 2018 • edited

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch 2 times, most recently from 5176bb1 to 0820b48 Dec 17, 2018

Dylan-DPC removed the S-waiting-on-review label Feb 11, 2019

This comment has been minimized.

Dylan-DPC commented Feb 11, 2019

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from 0820b48 to b4362a2 Feb 12, 2019

This comment has been minimized.

ljedrz commented Feb 12, 2019

This comment has been minimized.

rust-highfive commented Feb 12, 2019

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from b4362a2 to bbc1323 Feb 12, 2019

This comment has been minimized.

bors commented Feb 13, 2019

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from bbc1323 to cfab6c7 Feb 13, 2019

This comment has been minimized.

Dylan-DPC commented Feb 25, 2019

This comment has been minimized.

bors commented Feb 25, 2019

oli-obk referenced this pull request Feb 26, 2019

Cosmetic changes to compiler comments and docs #58619

This comment has been minimized.

Dylan-DPC commented Mar 11, 2019 • edited

This comment has been minimized.

ljedrz commented Mar 11, 2019

This comment has been minimized.

Dylan-DPC commented Mar 11, 2019

This comment has been minimized.

oli-obk commented Mar 11, 2019

This comment has been minimized.

ljedrz commented Mar 11, 2019

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from cfab6c7 to c0d52e7 Mar 11, 2019

This comment has been minimized.

ljedrz commented Dec 7, 2018 •

edited

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from `9135b3e` to `0e43db1` Dec 15, 2018

ljedrz commented Dec 15, 2018 •

edited

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from `0e43db1` to `aee9a7a` Dec 16, 2018

sinkuu reviewed Dec 16, 2018

View changes

ljedrz Dec 17, 2018 •

edited

sinkuu commented Dec 16, 2018 •

edited

ljedrz commented Dec 16, 2018 •

edited

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch 2 times, most recently from `5176bb1` to `0820b48` Dec 17, 2018

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from `0820b48` to `b4362a2` Feb 12, 2019

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from `b4362a2` to `bbc1323` Feb 12, 2019

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from `bbc1323` to `cfab6c7` Feb 13, 2019

Dylan-DPC commented Mar 11, 2019 •

edited

ljedrz force-pushed the ljedrz:x_py_clippy_fix branch from `cfab6c7` to `c0d52e7` Mar 11, 2019