diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-06-30 01:09:59 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-06 16:59:08 +0300 |
| commit | 987be89db32b37954bd34dcfbf3d381b24eabd35 (patch) | |
| tree | c9aa5e86b22c9148aab070bd1ab9d320d37e552d /src | |
| parent | ab112cab03a119ff092100cd3e472c7de1968f0b (diff) | |
| download | rust-987be89db32b37954bd34dcfbf3d381b24eabd35.tar.gz rust-987be89db32b37954bd34dcfbf3d381b24eabd35.zip | |
Fix tidy issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 2 | ||||
| -rw-r--r-- | src/tools/tidy/src/libcoretest.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 1329e6f7fce..2b242a71ad4 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -245,7 +245,7 @@ declare_features! ( (active, allocator_internals, "1.20.0", None, None), // Allows using the `format_args_nl` macro. - (active, format_args_nl, "1.29.0", None, None), + (active, format_args_nl, "1.29.0", Some(0), None), // no-tracking-issue-end diff --git a/src/tools/tidy/src/libcoretest.rs b/src/tools/tidy/src/libcoretest.rs index ea92f989ada..58c6aa12dc4 100644 --- a/src/tools/tidy/src/libcoretest.rs +++ b/src/tools/tidy/src/libcoretest.rs @@ -13,7 +13,8 @@ pub fn check(path: &Path, bad: &mut bool) { &mut |entry, contents| { let subpath = entry.path(); if let Some("rs") = subpath.extension().and_then(|e| e.to_str()) { - if contents.contains("#[test]") { + let contents = contents.trim(); + if !contents.starts_with("//") && contents.contains("#[test]") { tidy_error!( bad, "{} contains #[test]; libcore tests must be placed inside \ |