Skip to content

Commit 14ff2f5

Browse files
committedJun 23, 2019
Auto merge of #62080 - Centril:rollup-1wmgoy8, r=Centril
Rollup of 5 pull requests Successful merges: - #61778 (compiletest: Introduce `// {check,build,run}-pass` pass modes) - #62037 (Speed up tidy) - #62052 (submodules: Update clippy from 5a11ed7 to c5d1ecd) - #62070 (Run rustfmt on some libsyntax files) - #62075 (Remove `ast::Guard`) Failed merges: r? @ghost
2 parents 5d677b2 + a8b4d1d commit 14ff2f5

File tree

91 files changed

+850
-896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+850
-896
lines changed
 

‎Cargo.lock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3801,9 +3801,11 @@ dependencies = [
38013801
name = "tidy"
38023802
version = "0.1.0"
38033803
dependencies = [
3804+
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
38043805
"regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
38053806
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
38063807
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
3808+
"walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
38073809
]
38083810

38093811
[[package]]

‎src/bootstrap/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,8 +709,8 @@ impl Step for Tidy {
709709
if !builder.config.vendor {
710710
cmd.arg("--no-vendor");
711711
}
712-
if !builder.config.verbose_tests {
713-
cmd.arg("--quiet");
712+
if builder.is_verbose() {
713+
cmd.arg("--verbose");
714714
}
715715

716716
let _folder = builder.fold_output(|| "tidy");

0 commit comments

Comments
 (0)