Fix incorrect rustdoc JSON representation of #[doc(test(..))] attrs.

obi1kenobi · obi1kenobi · commit d3149ca7aa0d · 2026-03-06T21:14:14.000-05:00
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs
@@ -1041,10 +1041,10 @@ fn maybe_from_hir_attr(attr: &hir::Attribute, item_id: ItemId, tcx: TyCtxt<'_>)
             for attr_span in test_attrs {
                 // FIXME: This is ugly, remove when `test_attrs` has been ported to new attribute API.
                 if let Ok(snippet) = source_map.span_to_snippet(*attr_span) {
-                    ret.push(Attribute::Other(format!("#[doc(test(attr({snippet})))")));
+                    ret.push(Attribute::Other(format!("#[doc(test(attr({snippet})))]")));
                 }
             }
-            toggle_attr(&mut ret, "no_crate_inject", no_crate_inject);
+            toggle_attr(&mut ret, "test(no_crate_inject)", no_crate_inject);
             return ret;
         }
 
diff --git a/tests/rustdoc-json/attrs/no_crate_inject.rs b/tests/rustdoc-json/attrs/no_crate_inject.rs
@@ -0,0 +1,7 @@
+// Regression test for rustdoc JSON emitting
+// `#[doc(no_crate_inject)]` instead of `#[doc(test(no_crate_inject))]`:
+// https://github.com/rust-lang/rust/pull/153465
+
+//@ is "$.index[?(@.inner.module.is_crate)].attrs" '[{"other": "#[doc(test(no_crate_inject))]"}]'
+
+#![doc(test(no_crate_inject))]
diff --git a/tests/rustdoc-json/attrs/trailing_bracket.rs b/tests/rustdoc-json/attrs/trailing_bracket.rs
@@ -0,0 +1,7 @@
+// Regression test for rustdoc JSON emitting
+// `#[doc(test(attr(deny(rust_2018_idioms))))` without the trailing `]`:
+// https://github.com/rust-lang/rust/pull/153465
+
+//@ is "$.index[?(@.inner.module.is_crate)].attrs" '[{"other": "#[doc(test(attr(deny(rust_2018_idioms))))]"}]'
+
+#![doc(test(attr(deny(rust_2018_idioms))))]

Original file line number	Diff line number	Diff line change
`@@ -1041,10 +1041,10 @@ fn maybe_from_hir_attr(attr: &hir::Attribute, item_id: ItemId, tcx: TyCtxt<'_>)`
`1041`	`1041`	`for attr_span in test_attrs {`
`1042`	`1042`	// FIXME: This is ugly, remove when `test_attrs` has been ported to new attribute API.
`1043`	`1043`	`if let Ok(snippet) = source_map.span_to_snippet(*attr_span) {`
`1044`		`- ret.push(Attribute::Other(format!("#[doc(test(attr({snippet})))")));`
	`1044`	`+ ret.push(Attribute::Other(format!("#[doc(test(attr({snippet})))]")));`
`1045`	`1045`	`}`
`1046`	`1046`	`}`
`1047`		`- toggle_attr(&mut ret, "no_crate_inject", no_crate_inject);`
	`1047`	`+ toggle_attr(&mut ret, "test(no_crate_inject)", no_crate_inject);`
`1048`	`1048`	`return ret;`
`1049`	`1049`	`}`
`1050`	`1050`