Use doc_auto_cfg (#420)

tarcieri · web-flow · commit e3cdfa1507e3 · 2025-05-30T08:23:30.000-06:00
diff --git a/chacha20/src/lib.rs b/chacha20/src/lib.rs
@@ -100,7 +100,7 @@
 //! [`chacha20poly1305`]: https://docs.rs/chacha20poly1305
 
 #![no_std]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
     html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg"
@@ -335,15 +335,13 @@ impl<R: Rounds, V: Variant> BlockSizeUser for ChaChaCore<R, V> {
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl<R: Rounds, V: Variant> Drop for ChaChaCore<R, V> {
     fn drop(&mut self) {
         self.state.zeroize();
     }
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl<R: Rounds, V: Variant> ZeroizeOnDrop for ChaChaCore<R, V> {}
 
 /// The ChaCha20 quarter round function
diff --git a/chacha20/src/rng.rs b/chacha20/src/rng.rs
@@ -335,7 +335,6 @@ macro_rules! impl_chacha_rng {
         ///
         /// [^3]: Internet Research Task Force, [*ChaCha20 and Poly1305 for IETF Protocols*](
         ///       https://www.rfc-editor.org/rfc/rfc8439)
-        #[cfg_attr(docsrs, doc(cfg(feature = "rng")))]
         #[derive(Clone)]
         pub struct $ChaChaXRng {
             /// The ChaChaCore struct
@@ -375,11 +374,9 @@ macro_rules! impl_chacha_rng {
         impl CryptoRng for $ChaChaXRng {}
 
         #[cfg(feature = "zeroize")]
-        #[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
         impl ZeroizeOnDrop for $ChaChaXCore {}
 
         #[cfg(feature = "zeroize")]
-        #[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
         impl ZeroizeOnDrop for $ChaChaXRng {}
 
         // Custom Debug implementation that does not expose the internal state
diff --git a/chacha20/src/xchacha.rs b/chacha20/src/xchacha.rs
@@ -95,7 +95,6 @@ impl<R: Rounds> StreamCipherSeekCore for XChaChaCore<R> {
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl<R: Rounds> ZeroizeOnDrop for XChaChaCore<R> {}
 
 /// The HChaCha function: adapts the ChaCha core function in the same
diff --git a/hc-256/src/lib.rs b/hc-256/src/lib.rs
@@ -49,7 +49,7 @@
 //! [HC-256]: https://en.wikipedia.org/wiki/HC-256
 
 #![no_std]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
     html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg"
@@ -233,7 +233,6 @@ impl Hc256Core {
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl Drop for Hc256Core {
     fn drop(&mut self) {
         self.ptable.zeroize();
@@ -243,7 +242,6 @@ impl Drop for Hc256Core {
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl ZeroizeOnDrop for Hc256Core {}
 
 struct Backend<'a>(&'a mut Hc256Core);
diff --git a/rabbit/src/lib.rs b/rabbit/src/lib.rs
@@ -49,7 +49,7 @@
 //! [Rabbit]: https://tools.ietf.org/html/rfc4503#section-2.3
 
 #![no_std]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
     html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg"
@@ -298,7 +298,6 @@ impl StreamCipherCore for RabbitKeyOnlyCore {
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl ZeroizeOnDrop for RabbitKeyOnlyCore {}
 
 /// Core state of the Rabbit stream cipher initialized with key and IV.
@@ -359,5 +358,4 @@ impl StreamCipherBackend for Backend<'_> {
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl ZeroizeOnDrop for RabbitCore {}
diff --git a/rc4/src/lib.rs b/rc4/src/lib.rs
@@ -1,5 +1,5 @@
 #![no_std]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![doc = include_str!("../README.md")]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
@@ -100,7 +100,6 @@ impl<KeySize> StreamCipherCore for Rc4Core<KeySize> {
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl<KeySize> ZeroizeOnDrop for Rc4Core<KeySize> where KeySize: ArraySize {}
 
 struct Backend<'a>(&'a mut Rc4State);
diff --git a/salsa20/src/lib.rs b/salsa20/src/lib.rs
@@ -67,7 +67,7 @@
 //! [Salsa]: https://en.wikipedia.org/wiki/Salsa20
 
 #![no_std]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
     html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg"
@@ -246,13 +246,11 @@ impl<R: Unsigned> StreamCipherSeekCore for SalsaCore<R> {
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl<R: Unsigned> Drop for SalsaCore<R> {
     fn drop(&mut self) {
         self.state.zeroize();
     }
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl<R: Unsigned> ZeroizeOnDrop for SalsaCore<R> {}
diff --git a/salsa20/src/xsalsa.rs b/salsa20/src/xsalsa.rs
@@ -76,7 +76,6 @@ impl<R: Unsigned> StreamCipherSeekCore for XSalsaCore<R> {
 }
 
 #[cfg(feature = "zeroize")]
-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
 impl<R: Unsigned> ZeroizeOnDrop for XSalsaCore<R> {}
 
 /// The HSalsa20 function defined in the paper "Extending the Salsa20 nonce"

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@ impl<R: Rounds> StreamCipherSeekCore for XChaChaCore<R> {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`#[cfg(feature = "zeroize")]`
`98`		`-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]`
`99`	`98`	`impl<R: Rounds> ZeroizeOnDrop for XChaChaCore<R> {}`
`100`	`99`
`101`	`100`	`/// The HChaCha function: adapts the ChaCha core function in the same`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`//! [Salsa]: https://en.wikipedia.org/wiki/Salsa20`
`68`	`68`
`69`	`69`	`#![no_std]`
`70`		`-#![cfg_attr(docsrs, feature(doc_cfg))]`
	`70`	`+#![cfg_attr(docsrs, feature(doc_auto_cfg))]`
`71`	`71`	`#![doc(`
`72`	`72`	`html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",`
`73`	`73`	`html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg"`
`@@ -246,13 +246,11 @@ impl<R: Unsigned> StreamCipherSeekCore for SalsaCore<R> {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`#[cfg(feature = "zeroize")]`
`249`		`-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]`
`250`	`249`	`impl<R: Unsigned> Drop for SalsaCore<R> {`
`251`	`250`	`fn drop(&mut self) {`
`252`	`251`	`self.state.zeroize();`
`253`	`252`	`}`
`254`	`253`	`}`
`255`	`254`
`256`	`255`	`#[cfg(feature = "zeroize")]`
`257`		`-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]`
`258`	`256`	`impl<R: Unsigned> ZeroizeOnDrop for SalsaCore<R> {}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ impl<R: Unsigned> StreamCipherSeekCore for XSalsaCore<R> {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`#[cfg(feature = "zeroize")]`
`79`		`-#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]`
`80`	`79`	`impl<R: Unsigned> ZeroizeOnDrop for XSalsaCore<R> {}`
`81`	`80`
`82`	`81`	`/// The HSalsa20 function defined in the paper "Extending the Salsa20 nonce"`