Support nightly-2025-07-17 and later

tamird · tamird · commit b72e52b66ec5 · 2025-07-17T09:49:24.000-04:00
See rust-lang/rust#142936. Closes cargo-public-api#805.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Install the `cargo public-api` subcommand with a recent regular **stable** Rust
 cargo +stable install cargo-public-api --locked
 ```
 
-Ensure **nightly-2025-06-22** or later is installed (does not need to be the active toolchain) so `cargo public-api` can build rustdoc JSON for you:
+Ensure **nightly-2025-07-17** or later is installed (does not need to be the active toolchain) so `cargo public-api` can build rustdoc JSON for you:
 
 ```sh
 rustup install nightly --profile minimal
@@ -155,12 +155,12 @@ cargo public-api -sss
 
 | Version          | Understands the rustdoc JSON output of  |
 | ---------------- | --------------------------------------- |
-| 0.48.x           | nightly-2025-06-22 —                    |
+| 0.49.x           | nightly-2025-07-17 —                    |
+| 0.48.x           | nightly-2025-06-22 — nightly-2025-07-16 |
 | 0.47.x           | nightly-2025-03-24 — nightly-2025-06-21 |
 | 0.46.x           | nightly-2025-03-16 — nightly-2025-03-23 |
 | 0.45.x           | nightly-2025-03-14 — nightly-2025-03-15 |
 | 0.43.x — 0.44.x  | nightly-2025-01-25 — nightly-2025-03-13 |
-| 0.40.x — 0.42.x  | nightly-2024-10-18 — nightly-2025-01-24 |
 | earlier versions | see [here](https://github.com/cargo-public-api/cargo-public-api/blob/main/scripts/release-helper/src/version_info.rs) |
 
 # Contributing
diff --git a/cargo-public-api/MINIMUM_NIGHTLY_RUST_VERSION_FOR_TESTS b/cargo-public-api/MINIMUM_NIGHTLY_RUST_VERSION_FOR_TESTS
diff --git a/public-api/Cargo.toml b/public-api/Cargo.toml
@@ -23,7 +23,7 @@ version = "1.0.104"
 features = ["unbounded_depth"]
 
 [dependencies.rustdoc-types]
-version = "0.53.0"
+version = "0.54.0"
 
 [dev-dependencies]
 anyhow = "1.0.75"
diff --git a/public-api/src/item_processor.rs b/public-api/src/item_processor.rs
@@ -5,7 +5,7 @@ use crate::{
     public_item::PublicItem, render::RenderingContext,
 };
 use rustdoc_types::{
-    Crate, Id, Impl, Item, ItemEnum, Module, Struct, StructKind, Type, Use, VariantKind,
+    Attribute, Crate, Id, Impl, Item, ItemEnum, Module, Struct, StructKind, Type, Use, VariantKind,
 };
 use std::{
     collections::{HashMap, VecDeque},
@@ -397,10 +397,7 @@ pub(crate) enum ImplKind {
 impl ImplKind {
     fn from(impl_item: &Item, impl_: &Impl) -> Self {
         let has_blanket_impl = impl_.blanket_impl.is_some();
-        let is_automatically_derived = impl_item
-            .attrs
-            .iter()
-            .any(|a| a == "#[automatically_derived]");
+        let is_automatically_derived = impl_item.attrs.contains(&Attribute::AutomaticallyDerived);
 
         // See https://github.com/rust-lang/rust/blob/54f20bbb8a7aeab93da17c0019c1aaa10329245a/src/librustdoc/json/conversions.rs#L589-L590
         match (impl_.is_synthetic, has_blanket_impl) {
diff --git a/public-api/src/lib.rs b/public-api/src/lib.rs
@@ -62,7 +62,7 @@ pub use public_item::PublicItem;
 /// The rustdoc JSON format is still changing, so every now and then we update
 /// this library to support the latest format. If you use this version of
 /// nightly or later, you should be fine.
-pub const MINIMUM_NIGHTLY_RUST_VERSION: &str = "nightly-2025-06-22";
+pub const MINIMUM_NIGHTLY_RUST_VERSION: &str = "nightly-2025-07-17";
 // End-marker for scripts/release-helper/src/bin/update-version-info/main.rs
 
 /// See [`Builder`] method docs for what each field means.
diff --git a/public-api/src/render.rs b/public-api/src/render.rs
@@ -4,13 +4,14 @@ use crate::intermediate_public_item::IntermediatePublicItem;
 use crate::nameable_item::NameableItem;
 use crate::path_component::PathComponent;
 use crate::tokens::Token;
-use std::{cmp::Ordering, collections::HashMap, vec};
+use std::{borrow::Cow, cmp::Ordering, collections::HashMap};
 
 use rustdoc_types::{
-    Abi, AssocItemConstraint, AssocItemConstraintKind, Constant, Crate, FunctionHeader,
-    FunctionPointer, FunctionSignature, GenericArg, GenericArgs, GenericBound, GenericParamDef,
-    GenericParamDefKind, Generics, Id, Impl, Item, ItemEnum, MacroKind, Path, PolyTrait,
-    StructKind, Term, Trait, TraitBoundModifier, Type, VariantKind, WherePredicate,
+    Abi, AssocItemConstraint, AssocItemConstraintKind, Attribute, AttributeRepr, Constant, Crate,
+    FunctionHeader, FunctionPointer, FunctionSignature, GenericArg, GenericArgs, GenericBound,
+    GenericParamDef, GenericParamDefKind, Generics, Id, Impl, Item, ItemEnum, MacroKind, Path,
+    PolyTrait, ReprKind, StructKind, Term, Trait, TraitBoundModifier, Type, VariantKind,
+    WherePredicate,
 };
 
 /// A simple macro to write `Token::Whitespace` in less characters.
@@ -41,9 +42,46 @@ impl<'c> RenderingContext<'c> {
         let mut tokens = vec![];
 
         for attr in &item.attrs {
-            let attr = attr.trim();
-            if attr_relevant_for_public_apis(attr) {
-                tokens.push(Token::Annotation(attr.to_string()));
+            if let Some(annotation) = match attr {
+                Attribute::ExportName(name) => Some(format!("#[export_name = \"{name}\"]")),
+                Attribute::LinkSection(section) => Some(format!("#[link_section = \"{section}\"]")),
+                Attribute::NoMangle => Some("#[no_mangle]".to_string()),
+                Attribute::NonExhaustive => Some("#[non_exhaustive]".to_string()),
+                Attribute::Repr(AttributeRepr {
+                    kind,
+                    align,
+                    packed,
+                    int,
+                }) => {
+                    let mut items: Vec<Cow<'static, str>> = vec![];
+                    if let Some(kind) = match kind {
+                        ReprKind::Rust => None,
+                        ReprKind::C => Some("C"),
+                        ReprKind::Transparent => Some("transparent"),
+                        ReprKind::Simd => Some("simd"),
+                    } {
+                        items.push(Cow::Borrowed(kind));
+                    }
+                    if let Some(align) = align {
+                        items.push(Cow::Owned(format!("align({align})")))
+                    }
+                    if let Some(packed) = packed {
+                        items.push(Cow::Owned(format!("packed({packed})")))
+                    }
+                    if let Some(int) = int {
+                        items.push(Cow::Owned(int.to_string()))
+                    }
+                    (!items.is_empty()).then(|| {
+                        let mut s = String::new();
+                        s.push_str("#[repr(");
+                        s.push_str(&items.join(", "));
+                        s.push_str(")]");
+                        s
+                    })
+                }
+                _ => None,
+            } {
+                tokens.push(Token::Annotation(annotation));
                 tokens.push(ws!());
             }
         }
@@ -1023,26 +1061,6 @@ impl<'c> RenderingContext<'c> {
     }
 }
 
-/// Our list of allowed attributes comes from
-/// <https://github.com/rust-lang/rust/blob/68d0b29098/src/librustdoc/html/render/mod.rs#L941-L942>
-fn attr_relevant_for_public_apis(attr: &str) -> bool {
-    let keywords = [
-        "export_name",
-        "link_section",
-        "no_mangle",
-        "non_exhaustive",
-        "repr",
-    ];
-
-    for keyword in keywords {
-        if attr.to_lowercase().contains(keyword) {
-            return true;
-        }
-    }
-
-    false
-}
-
 fn pub_() -> Vec<Token> {
     vec![Token::qualifier("pub"), ws!()]
 }
diff --git a/scripts/release-helper/src/version_info.rs b/scripts/release-helper/src/version_info.rs
@@ -6,6 +6,10 @@ pub struct CargoPublicApiVersionInfo {
 }
 
 pub static TABLE: &[CargoPublicApiVersionInfo] = &[
+    CargoPublicApiVersionInfo {
+        cargo_public_api_version: "0.49.x",
+        min_nightly_rust_version: "nightly-2025-07-17",
+    },
     CargoPublicApiVersionInfo {
         cargo_public_api_version: "0.48.x",
         min_nightly_rust_version: "nightly-2025-06-22",
