Skip to content

Commit

Permalink
Auto merge of #33365 - birkenfeld:makehelpfix, r=alexcrichton
Browse files Browse the repository at this point in the history
Makefile: there is only one tidy target now

Also removes mention of tidy.py from the tidy sources.
  • Loading branch information
bors committed May 9, 2016
2 parents 27edda2 + e24999e commit 50909f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@
# * check-stage$(stage)-$(crate) - Test a crate in a specific stage
# * check-stage$(stage)-{rpass,rfail,cfail,rmake,...} - Run tests in src/test/
# * check-stage1-T-$(target)-H-$(host) - Run cross-compiled-tests
# * tidy-basic - show file / line stats
# * tidy-errors - show the highest rustc error code
# * tidy-features - show the status of language and lib features
# * tidy - Basic style check, show highest rustc error code and
# the status of language and lib features
# * rustc-stage$(stage) - Only build up to a specific stage
#
# Then mix in some of these environment variables to harness the
Expand Down
2 changes: 1 addition & 1 deletion src/tools/tidy/src/style.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub fn check(path: &Path, bad: &mut bool) {
if line.contains("\r") && !skip_cr {
err("CR character");
}
if filename != "style.rs" && filename != "tidy.py" {
if filename != "style.rs" {
if line.contains("TODO") {
err("TODO is deprecated; use FIXME")
}
Expand Down

0 comments on commit 50909f2

Please sign in to comment.