Stop using zeroize::__internal

Author: daxpedda

CHANGELOG.md

@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `no_drop` item-level option to `ZeroizeOnDrop` which does not implement
   `Drop` but instead only asserts that every field implements `ZeroizeOnDrop`.
 
+### Fixed
+- Stop depending on unstable APIs of `zeroize` to implement `ZeroizeOnDrop`.
+
 ## [1.4.0] - 2025-05-01
 
 ### Added

src/test/zeroize.rs

@@ -52,13 +52,28 @@ fn drop() -> Result<()> {
 			where T: ::zeroize::ZeroizeOnDrop
 			{
 				fn drop(&mut self) {
-					use ::zeroize::__internal::AssertZeroize;
-					use ::zeroize::__internal::AssertZeroizeOnDrop;
+					trait AssertZeroizeOnDrop {
+						fn __derive_where_zeroize_or_on_drop(self);
+					}
+
+					impl<T: ::zeroize::ZeroizeOnDrop + ?::core::marker::Sized> AssertZeroizeOnDrop for &&mut T {
+						fn __derive_where_zeroize_or_on_drop(self) {}
+					}
+
+					trait AssertZeroize {
+						fn __derive_where_zeroize_or_on_drop(&mut self);
+					}
+
+					impl<T: ::zeroize::Zeroize + ?::core::marker::Sized> AssertZeroize for T {
+						fn __derive_where_zeroize_or_on_drop(&mut self) {
+							::zeroize::Zeroize::zeroize(self);
+						}
+					}
 
 					match self {
 						Test(ref mut __field_0, ref mut __field_1) => {
-							__field_0.zeroize_or_on_drop();
-							__field_1.zeroize_or_on_drop();
+							__field_0.__derive_where_zeroize_or_on_drop();
+							__field_1.__derive_where_zeroize_or_on_drop();
 						}
 					}
 				}
@@ -92,13 +107,28 @@ fn both() -> Result<()> {
 		where T: ::zeroize::ZeroizeOnDrop
 		{
 			fn drop(&mut self) {
-				use ::zeroize::__internal::AssertZeroize;
-				use ::zeroize::__internal::AssertZeroizeOnDrop;
+				trait AssertZeroizeOnDrop {
+					fn __derive_where_zeroize_or_on_drop(self);
+				}
+
+				impl<T: ::zeroize::ZeroizeOnDrop + ?::core::marker::Sized> AssertZeroizeOnDrop for &&mut T {
+					fn __derive_where_zeroize_or_on_drop(self) {}
+				}
+
+				trait AssertZeroize {
+					fn __derive_where_zeroize_or_on_drop(&mut self);
+				}
+
+				impl<T: ::zeroize::Zeroize + ?::core::marker::Sized> AssertZeroize for T {
+					fn __derive_where_zeroize_or_on_drop(&mut self) {
+						::zeroize::Zeroize::zeroize(self);
+					}
+				}
 
 				match self {
 					Test(ref mut __field_0, ref mut __field_1) => {
-						__field_0.zeroize_or_on_drop();
-						__field_1.zeroize_or_on_drop();
+						__field_0.__derive_where_zeroize_or_on_drop();
+						__field_1.__derive_where_zeroize_or_on_drop();
 					}
 				}
 			}
@@ -188,12 +218,27 @@ fn crate_drop() -> Result<()> {
 			where T: zeroize_::ZeroizeOnDrop
 			{
 				fn drop(&mut self) {
-					use zeroize_::__internal::AssertZeroize;
-					use zeroize_::__internal::AssertZeroizeOnDrop;
+					trait AssertZeroizeOnDrop {
+						fn __derive_where_zeroize_or_on_drop(self);
+					}
+
+					impl<T: zeroize_::ZeroizeOnDrop + ?::core::marker::Sized> AssertZeroizeOnDrop for &&mut T {
+						fn __derive_where_zeroize_or_on_drop(self) {}
+					}
+
+					trait AssertZeroize {
+						fn __derive_where_zeroize_or_on_drop(&mut self);
+					}
+
+					impl<T: zeroize_::Zeroize + ?::core::marker::Sized> AssertZeroize for T {
+						fn __derive_where_zeroize_or_on_drop(&mut self) {
+							zeroize_::Zeroize::zeroize(self);
+						}
+					}
 
 					match self {
 						Test(ref mut __field_0) => {
-							__field_0.zeroize_or_on_drop();
+							__field_0.__derive_where_zeroize_or_on_drop();
 						}
 					}
 				}
@@ -285,12 +330,27 @@ fn enum_skip_drop() -> Result<()> {
 			#[automatically_derived]
 			impl <T> ::core::ops::Drop for Test<T> {
 				fn drop(&mut self) {
-					use ::zeroize::__internal::AssertZeroize;
-					use ::zeroize::__internal::AssertZeroizeOnDrop;
+					trait AssertZeroizeOnDrop {
+						fn __derive_where_zeroize_or_on_drop(self);
+					}
+
+					impl<T: ::zeroize::ZeroizeOnDrop + ?::core::marker::Sized> AssertZeroizeOnDrop for &&mut T {
+						fn __derive_where_zeroize_or_on_drop(self) {}
+					}
+
+					trait AssertZeroize {
+						fn __derive_where_zeroize_or_on_drop(&mut self);
+					}
+
+					impl<T: ::zeroize::Zeroize + ?::core::marker::Sized> AssertZeroize for T {
+						fn __derive_where_zeroize_or_on_drop(&mut self) {
+							::zeroize::Zeroize::zeroize(self);
+						}
+					}
 
 					match self {
 						Test::A(ref mut __field_0) => {
-							__field_0.zeroize_or_on_drop();
+							__field_0.__derive_where_zeroize_or_on_drop();
 						}
 						Test::B(ref mut __field_0) => { }
 					}

src/trait_/zeroize_on_drop.rs

@@ -184,23 +184,28 @@ impl TraitImpl for ZeroizeOnDrop {
 						}
 					}
 				} else {
-					let crate_ = self.crate_();
-					let internal = util::path_segment("__internal");
-
-					let mut assert_zeroize = crate_.clone();
-					assert_zeroize
-						.segments
-						.extend([internal.clone(), util::path_segment("AssertZeroize")]);
-
-					let mut assert_zeroize_on_drop = crate_;
-					assert_zeroize_on_drop
-						.segments
-						.extend([internal, util::path_segment("AssertZeroizeOnDrop")]);
+					let zeroize = util::path_from_root_and_strs(self.crate_(), &["Zeroize"]);
+					let zeroize_on_drop = self.path();
 
 					quote! {
 						fn drop(&mut self) {
-							use #assert_zeroize;
-							use #assert_zeroize_on_drop;
+							trait AssertZeroizeOnDrop {
+								fn __derive_where_zeroize_or_on_drop(self);
+							}
+
+							impl<T: #zeroize_on_drop + ?::core::marker::Sized> AssertZeroizeOnDrop for &&mut T {
+								fn __derive_where_zeroize_or_on_drop(self) {}
+							}
+
+							trait AssertZeroize {
+								fn __derive_where_zeroize_or_on_drop(&mut self);
+							}
+
+							impl<T: #zeroize + ?::core::marker::Sized> AssertZeroize for T {
+								fn __derive_where_zeroize_or_on_drop(&mut self) {
+									#zeroize::zeroize(self);
+								}
+							}
 
 							match self {
 								#body
@@ -242,7 +247,7 @@ impl TraitImpl for ZeroizeOnDrop {
 				} else {
 					quote! {
 						#self_pattern => {
-							#(#self_ident.zeroize_or_on_drop();)*
+							#(#self_ident.__derive_where_zeroize_or_on_drop();)*
 						}
 					}
 				}