about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-05-25 04:55:30 +0200
committerGitHub <noreply@github.com>2019-05-25 04:55:30 +0200
commit835281fb04c9f8470ce66e1b4e97a2d940f91ae0 (patch)
tree35ca49ac078d9c1ba74527bed1862ff5da70f898
parent2ac8ec046316d516316afb05b363493095266eb6 (diff)
parent46ffb6adbaed91a09d36953970078b0fae6de61f (diff)
downloadrust-835281fb04c9f8470ce66e1b4e97a2d940f91ae0.tar.gz
rust-835281fb04c9f8470ce66e1b4e97a2d940f91ae0.zip
Rollup merge of #61096 - ehuss:tidy-license-short-circuit, r=Centril
tidy: don't short-circuit on license error

If there is more than one license error, tidy would only print the first
error. This changes it so that all license errors are printed.
-rw-r--r--src/tools/tidy/src/deps.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index b70ca6c4e79..edef26e6b02 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -244,7 +244,7 @@ pub fn check(path: &Path, bad: &mut bool) {
         }
 
         let toml = dir.path().join("Cargo.toml");
-        *bad = *bad || !check_license(&toml);
+        *bad = !check_license(&toml) || *bad;
     }
     assert!(saw_dir, "no vendored source");
 }