Skip to content

Commit 50909f2

Browse files
committed
Auto merge of rust-lang#33365 - birkenfeld:makehelpfix, r=alexcrichton
Makefile: there is only one tidy target now Also removes mention of tidy.py from the tidy sources.
2 parents 27edda2 + e24999e commit 50909f2

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Diff for: Makefile.in

+2-3
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@
5959
# * check-stage$(stage)-$(crate) - Test a crate in a specific stage
6060
# * check-stage$(stage)-{rpass,rfail,cfail,rmake,...} - Run tests in src/test/
6161
# * check-stage1-T-$(target)-H-$(host) - Run cross-compiled-tests
62-
# * tidy-basic - show file / line stats
63-
# * tidy-errors - show the highest rustc error code
64-
# * tidy-features - show the status of language and lib features
62+
# * tidy - Basic style check, show highest rustc error code and
63+
# the status of language and lib features
6564
# * rustc-stage$(stage) - Only build up to a specific stage
6665
#
6766
# Then mix in some of these environment variables to harness the

Diff for: src/tools/tidy/src/style.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ pub fn check(path: &Path, bad: &mut bool) {
7373
if line.contains("\r") && !skip_cr {
7474
err("CR character");
7575
}
76-
if filename != "style.rs" && filename != "tidy.py" {
76+
if filename != "style.rs" {
7777
if line.contains("TODO") {
7878
err("TODO is deprecated; use FIXME")
7979
}

0 commit comments

Comments
 (0)