diff options
| author | bors <bors@rust-lang.org> | 2016-05-08 20:07:10 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-08 20:07:10 -0700 |
| commit | 50909f2d5036e59871f779500dd722a62421c13c (patch) | |
| tree | 9be2fb5f084760f0c7f65ca61d643f6a0b569849 | |
| parent | 27edda241157da188d4fa94ed341a0e90160fa2f (diff) | |
| parent | e24999e485bacec531ff228636cc966ba10e87c5 (diff) | |
| download | rust-50909f2d5036e59871f779500dd722a62421c13c.tar.gz rust-50909f2d5036e59871f779500dd722a62421c13c.zip | |
Auto merge of #33365 - birkenfeld:makehelpfix, r=alexcrichton
Makefile: there is only one tidy target now Also removes mention of tidy.py from the tidy sources.
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | src/tools/tidy/src/style.rs | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index ce67abad39b..58cd2e31060 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs index 61230b3b030..c722eb690b8 100644 --- a/src/tools/tidy/src/style.rs +++ b/src/tools/tidy/src/style.rs @@ -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") } |
