about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-10-20 22:23:36 +0000
committerbors <bors@rust-lang.org>2018-10-20 22:23:36 +0000
commitd5418764ada3ce7b308de7a0e6e260548a635afc (patch)
treeb3fa56e507a8d1a894e35e9a00a70c5ce73e0f67 /src/tools
parent155510e377ae2a8d8ee0dad1a5f809c9062a5526 (diff)
parentf2848a010adf22d43fd713975b4945402d585554 (diff)
downloadrust-d5418764ada3ce7b308de7a0e6e260548a635afc.tar.gz
rust-d5418764ada3ce7b308de7a0e6e260548a635afc.zip
Auto merge of #55230 - Manishearth:rollup, r=Manishearth
Rollup of 5 pull requests

Successful merges:

 - #55156 (Fixed: Multiple errors on single typo in match pattern)
 - #55189 (update books for the next release)
 - #55193 (make asm diagnostic instruction optional)
 - #55203 (Write an initial version of the `program_clauses` callback)
 - #55213 (ignore target folders)

Failed merges:

r? @ghost
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/tidy/src/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/tidy/src/lib.rs b/src/tools/tidy/src/lib.rs
index c4bd0bbd03c..c5f5896d286 100644
--- a/src/tools/tidy/src/lib.rs
+++ b/src/tools/tidy/src/lib.rs
@@ -78,6 +78,7 @@ fn filter_dirs(path: &Path) -> bool {
         "src/tools/lldb",
         "src/target",
         "src/stdsimd",
+        "target",
     ];
     skip.iter().any(|p| path.ends_with(p))
 }