From 987be89db32b37954bd34dcfbf3d381b24eabd35 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Sun, 30 Jun 2019 01:09:59 +0300 Subject: [PATCH] Fix tidy issues --- src/libsyntax/feature_gate.rs | 2 +- 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 1329e6f7fce8..2b242a71ad4c 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 ea92f989ada7..58c6aa12dc48 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 \