Unrolled build for #142875

Rollup merge of #142875 - GuillaumeGomez:rustdoc-json-types-version-update, r=Kobzol

Check rustdoc-json-types FORMAT_VERSION is correctly updated

Follow-up of #142677.

``@nnethercote`` suggested that we should also ensure that the `FORMAT_VERSION` was only increased by 1 and we should check for it, this PR does it.

cc ``@aDotInTheVoid``
r? ghost

Author: rust-timer

src/tools/tidy/src/rustdoc_json.rs

@@ -4,6 +4,7 @@
 use std::ffi::OsStr;
 use std::path::Path;
 use std::process::Command;
+use std::str::FromStr;
 
 use build_helper::ci::CiEnv;
 use build_helper::git::{GitConfig, get_closest_upstream_commit};
@@ -71,9 +72,22 @@ pub fn check(src_path: &Path, bad: &mut bool) {
         Some(output) => {
             let mut format_version_updated = false;
             let mut latest_feature_comment_updated = false;
+            let mut new_version = None;
+            let mut old_version = None;
             for line in output.lines() {
                 if line.starts_with("+pub const FORMAT_VERSION: u32 =") {
                     format_version_updated = true;
+                    new_version = line
+                        .split('=')
+                        .nth(1)
+                        .and_then(|s| s.trim().split(';').next())
+                        .and_then(|s| u32::from_str(s.trim()).ok());
+                } else if line.starts_with("-pub const FORMAT_VERSION: u32 =") {
+                    old_version = line
+                        .split('=')
+                        .nth(1)
+                        .and_then(|s| s.trim().split(';').next())
+                        .and_then(|s| u32::from_str(s.trim()).ok());
                 } else if line.starts_with("+// Latest feature:") {
                     latest_feature_comment_updated = true;
                 }
@@ -92,6 +106,17 @@ pub fn check(src_path: &Path, bad: &mut bool) {
                     );
                 }
             }
+            match (new_version, old_version) {
+                (Some(new_version), Some(old_version)) if new_version != old_version + 1 => {
+                    *bad = true;
+                    eprintln!(
+                        "error in `rustdoc_json` tidy check: invalid `FORMAT_VERSION` increase in \
+                         `{RUSTDOC_JSON_TYPES}/lib.rs`, should be `{}`, found `{new_version}`",
+                        old_version + 1,
+                    );
+                }
+                _ => {}
+            }
         }
         None => {
             *bad = true;