about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-01-22 15:32:52 +0100
committerGitHub <noreply@github.com>2022-01-22 15:32:52 +0100
commit45f5f342930f17b6eeca962d0ff25d889f4e6cc6 (patch)
tree4bc604a07c806e6623cca08fd7af7b5f138c04c9
parent2ecbc4b49d868712f039e2917e54121a4792545d (diff)
parent1521b53c532ccd90c504b0c860cd5662172cc05e (diff)
downloadrust-45f5f342930f17b6eeca962d0ff25d889f4e6cc6.tar.gz
rust-45f5f342930f17b6eeca962d0ff25d889f4e6cc6.zip
Rollup merge of #93132 - Urgau:fix-rustdoc-json-format-version, r=oli-obk
Increase the format version of rustdoc-json-types

PR https://github.com/rust-lang/rust/pull/87648 changed `rustdoc-json-types` without increasing the format version.
https://github.com/rust-lang/rust/commit/e7529d6a3867ed1692818702b40814ee992eba2d#diff-ede26372490522288745c5b3df2b6b2a1cc913dcd09b29af3a49935afe00c7e6

This PR increase the format version by +1 and move the `FORMAT_VERSION` constant to the start of the file to hopefully make it more clear that `rustdoc-json-types` is versioned.
-rw-r--r--src/rustdoc-json-types/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rustdoc-json-types/lib.rs b/src/rustdoc-json-types/lib.rs
index 618c8aab86a..600833664be 100644
--- a/src/rustdoc-json-types/lib.rs
+++ b/src/rustdoc-json-types/lib.rs
@@ -8,6 +8,9 @@ use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
 
+/// rustdoc format-version.
+pub const FORMAT_VERSION: u32 = 10;
+
 /// A `Crate` is the root of the emitted JSON blob. It contains all type/documentation information
 /// about the language items in the local crate, as well as info about external items to allow
 /// tools to find or link to them.
@@ -517,8 +520,5 @@ pub struct Static {
     pub expr: String,
 }
 
-/// rustdoc format-version.
-pub const FORMAT_VERSION: u32 = 9;
-
 #[cfg(test)]
 mod tests;