From d7acf596cf01d01ec916752aa26a6e1c83dd4634 Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Sat, 4 May 2019 03:34:05 +0200
Subject: [PATCH] Rename 'no tracking issue START' to fit better with tidy.

---
 src/libsyntax/feature_gate.rs  | 16 ++++++++--------
 src/tools/tidy/src/features.rs |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 40cf181543f..ae297f9a4a3 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -119,7 +119,7 @@ pub fn walk_feature_fields<F>(&self, mut f: F)
     // feature-group-start: internal feature gates
     // -------------------------------------------------------------------------
 
-    // no tracking issue START
+    // no-tracking-issue-start
 
     // Allows using the `rust-intrinsic`'s "ABI".
     (active, intrinsics, "1.0.0", None, None),
@@ -152,7 +152,7 @@ pub fn walk_feature_fields<F>(&self, mut f: F)
     // lets a function to be `const` when opted into with `#![feature(foo)]`.
     (active, rustc_const_unstable, "1.0.0", None, None),
 
-    // no tracking issue END
+    // no-tracking-issue-end
 
     // Allows using `#[link_name="llvm.*"]`.
     (active, link_llvm_intrinsics, "1.0.0", Some(29602), None),
@@ -187,17 +187,17 @@ pub fn walk_feature_fields<F>(&self, mut f: F)
     // Allows using `box` in patterns (RFC 469).
     (active, box_patterns, "1.0.0", Some(29641), None),
 
-    // no tracking issue START
+    // no-tracking-issue-start
 
     // Allows using `#[prelude_import]` on glob `use` items.
     (active, prelude_import, "1.2.0", None, None),
 
-    // no tracking issue END
+    // no-tracking-issue-end
 
     // Allows using `#[unsafe_destructor_blind_to_params]` (RFC 1238).
     (active, dropck_parametricity, "1.3.0", Some(28498), None),
 
-    // no tracking issue START
+    // no-tracking-issue-start
 
     // Allows using `#[omit_gdb_pretty_printer_section]`.
     (active, omit_gdb_pretty_printer_section, "1.5.0", None, None),
@@ -205,7 +205,7 @@ pub fn walk_feature_fields<F>(&self, mut f: F)
     // Allows using the `vectorcall` ABI.
     (active, abi_vectorcall, "1.7.0", None, None),
 
-    // no tracking issue END
+    // no-tracking-issue-end
 
     // Allows using `#[structural_match]` which indicates that a type is structurally matchable.
     (active, structural_match, "1.8.0", Some(31434), None),
@@ -219,7 +219,7 @@ pub fn walk_feature_fields<F>(&self, mut f: F)
     // Allows declaring with `#![needs_panic_runtime]` that a panic runtime is needed.
     (active, needs_panic_runtime, "1.10.0", Some(32837), None),
 
-    // no tracking issue START
+    // no-tracking-issue-start
 
     // Allows identifying the `compiler_builtins` crate.
     (active, compiler_builtins, "1.13.0", None, None),
@@ -242,7 +242,7 @@ pub fn walk_feature_fields<F>(&self, mut f: F)
     // Allows using the `format_args_nl` macro.
     (active, format_args_nl, "1.29.0", None, None),
 
-    // no tracking issue END
+    // no-tracking-issue-end
 
     // Added for testing E0705; perma-unstable.
     (active, test_2018_feature, "1.31.0", Some(0), Some(Edition::Edition2018)),
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index 3144df6dd4c..a1a8ab806ea 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -191,7 +191,7 @@ pub fn collect_lang_features(base_src_path: &Path, bad: &mut bool) -> Features {
 
     // We allow rustc-internal features to omit a tracking issue.
     // To make tidy accept omitting a tracking issue, group the list of features
-    // without one inside `// no tracking issue START` and `// no tracking issue END`.
+    // without one inside `// no-tracking-issue` and `// no-tracking-issue-end`.
     let mut next_feature_omits_tracking_issue = false;
 
     let mut in_feature_group = false;
@@ -201,13 +201,13 @@ pub fn collect_lang_features(base_src_path: &Path, bad: &mut bool) -> Features {
         .filter_map(|(line, line_number)| {
             let line = line.trim();
 
-            // Within START and END, the tracking issue can be omitted.
+            // Within -start and -end, the tracking issue can be omitted.
             match line {
-                "// no tracking issue START" => {
+                "// no-tracking-issue-start" => {
                     next_feature_omits_tracking_issue = true;
                     return None;
                 }
-                "// no tracking issue END" => {
+                "// no-tracking-issue-end" => {
                     next_feature_omits_tracking_issue = false;
                     return None;
                 }