Fixup after rebase

serde/Cargo.toml

@@ -1,7 +1,10 @@
 [package]
 name = "serde"
 version = "1.0.204"
-authors = ["Erick Tryzelaar <[email protected]>", "David Tolnay <[email protected]>"]
+authors = [
+    "Erick Tryzelaar <[email protected]>",
+    "David Tolnay <[email protected]>",
+]
 build = "build.rs"
 categories = ["encoding", "no-std", "no-std::no-alloc"]
 description = "A generic serialization/deserialization framework"
@@ -16,7 +19,7 @@ rust-version = "1.31"
 
 [dependencies]
 serde_derive = { version = "1", optional = true, path = "../serde_derive" }
-serde_core = { version = "=1.0.203", path = "../serde_core", default-features = false }
+serde_core = { version = "=1.0.204", path = "../serde_core", default-features = false }
 
 [dev-dependencies]
 serde_derive = { version = "1", path = "../serde_derive" }

serde_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_core"
-version = "1.0.203" # remember to update html_root_url and serde_derive dependency
+version = "1.0.204" # remember to update html_root_url and serde_derive dependency
 authors = [
     "Erick Tryzelaar <[email protected]>",
     "David Tolnay <[email protected]>",

serde_core/build.rs

@@ -84,6 +84,11 @@ fn main() {
     if minor < 74 {
         println!("cargo:rustc-cfg=no_core_num_saturating");
     }
+    // Support for the `#[diagnostic]` tool attribute namespace
+    // https://blog.rust-lang.org/2024/05/02/Rust-1.78.0.html#diagnostic-attributes
+    if minor < 78 {
+        println!("cargo:rustc-cfg=no_diagnostic_namespace");
+    }
 }
 
 fn rustc_minor_version() -> Option<u32> {

serde_core/src/lib.rs

@@ -15,7 +15,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Serde types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/serde/1.0.203")]
+#![doc(html_root_url = "https://docs.rs/serde/1.0.204")]
 // Support using Serde without the standard library!
 #![cfg_attr(not(feature = "std"), no_std)]
 // Show which crate feature enables conditionally compiled APIs in documentation.